Commit 8ea3c06a2e4d9c6e63461dd56ea74a0a84275e14
Committed by
Richard Weinberger
Richard Weinberger
1 parent
3ee6bd8e8d
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
um: clean up the includes in ubd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Showing 4 changed files with 34 additions and 50 deletions Side-by-side Diff
arch/um/drivers/ubd.h
| 1 | +/* | |
| 2 | + * Copyright (C) 2000 Jeff Dike (jdike@karaya.com) | |
| 3 | + * Copyright (C) 2001 RidgeRun, Inc (glonnon@ridgerun.com) | |
| 4 | + * Licensed under the GPL | |
| 5 | + */ | |
| 6 | + | |
| 7 | +#ifndef __UM_UBD_USER_H | |
| 8 | +#define __UM_UBD_USER_H | |
| 9 | + | |
| 10 | +extern void ignore_sigwinch_sig(void); | |
| 11 | +extern int start_io_thread(unsigned long sp, int *fds_out); | |
| 12 | +extern int io_thread(void *arg); | |
| 13 | +extern int kernel_fd; | |
| 14 | + | |
| 15 | +#endif |
arch/um/drivers/ubd_kern.c
| ... | ... | @@ -19,40 +19,26 @@ |
| 19 | 19 | |
| 20 | 20 | #define UBD_SHIFT 4 |
| 21 | 21 | |
| 22 | -#include "linux/kernel.h" | |
| 23 | -#include "linux/module.h" | |
| 24 | -#include "linux/blkdev.h" | |
| 25 | -#include "linux/ata.h" | |
| 26 | -#include "linux/hdreg.h" | |
| 27 | -#include "linux/init.h" | |
| 28 | -#include "linux/cdrom.h" | |
| 29 | -#include "linux/proc_fs.h" | |
| 30 | -#include "linux/seq_file.h" | |
| 31 | -#include "linux/ctype.h" | |
| 32 | -#include "linux/capability.h" | |
| 33 | -#include "linux/mm.h" | |
| 34 | -#include "linux/slab.h" | |
| 35 | -#include "linux/vmalloc.h" | |
| 36 | -#include "linux/mutex.h" | |
| 37 | -#include "linux/blkpg.h" | |
| 38 | -#include "linux/genhd.h" | |
| 39 | -#include "linux/spinlock.h" | |
| 40 | -#include "linux/platform_device.h" | |
| 41 | -#include "linux/scatterlist.h" | |
| 42 | -#include "asm/segment.h" | |
| 43 | -#include "asm/uaccess.h" | |
| 44 | -#include "asm/irq.h" | |
| 45 | -#include "asm/types.h" | |
| 46 | -#include "asm/tlbflush.h" | |
| 47 | -#include "mem_user.h" | |
| 22 | +#include <linux/module.h> | |
| 23 | +#include <linux/init.h> | |
| 24 | +#include <linux/blkdev.h> | |
| 25 | +#include <linux/ata.h> | |
| 26 | +#include <linux/hdreg.h> | |
| 27 | +#include <linux/cdrom.h> | |
| 28 | +#include <linux/proc_fs.h> | |
| 29 | +#include <linux/seq_file.h> | |
| 30 | +#include <linux/ctype.h> | |
| 31 | +#include <linux/slab.h> | |
| 32 | +#include <linux/vmalloc.h> | |
| 33 | +#include <linux/platform_device.h> | |
| 34 | +#include <linux/scatterlist.h> | |
| 35 | +#include <asm/tlbflush.h> | |
| 48 | 36 | #include "kern_util.h" |
| 49 | 37 | #include "mconsole_kern.h" |
| 50 | 38 | #include "init.h" |
| 51 | -#include "irq_user.h" | |
| 52 | 39 | #include "irq_kern.h" |
| 53 | -#include "ubd_user.h" | |
| 40 | +#include "ubd.h" | |
| 54 | 41 | #include "os.h" |
| 55 | -#include "mem.h" | |
| 56 | 42 | #include "cow.h" |
| 57 | 43 | |
| 58 | 44 | enum ubd_req { UBD_READ, UBD_WRITE }; |
arch/um/drivers/ubd_user.c
| ... | ... | @@ -15,13 +15,11 @@ |
| 15 | 15 | #include <sys/socket.h> |
| 16 | 16 | #include <sys/mman.h> |
| 17 | 17 | #include <sys/param.h> |
| 18 | -#include "asm/types.h" | |
| 19 | -#include "ubd_user.h" | |
| 20 | -#include "os.h" | |
| 21 | -#include "cow.h" | |
| 22 | - | |
| 23 | 18 | #include <endian.h> |
| 24 | 19 | #include <byteswap.h> |
| 20 | + | |
| 21 | +#include "ubd.h" | |
| 22 | +#include "os.h" | |
| 25 | 23 | |
| 26 | 24 | void ignore_sigwinch_sig(void) |
| 27 | 25 | { |
arch/um/drivers/ubd_user.h
| 1 | -/* | |
| 2 | - * Copyright (C) 2000 Jeff Dike (jdike@karaya.com) | |
| 3 | - * Copyright (C) 2001 RidgeRun, Inc (glonnon@ridgerun.com) | |
| 4 | - * Licensed under the GPL | |
| 5 | - */ | |
| 6 | - | |
| 7 | -#ifndef __UM_UBD_USER_H | |
| 8 | -#define __UM_UBD_USER_H | |
| 9 | - | |
| 10 | -extern void ignore_sigwinch_sig(void); | |
| 11 | -extern int start_io_thread(unsigned long sp, int *fds_out); | |
| 12 | -extern int io_thread(void *arg); | |
| 13 | -extern int kernel_fd; | |
| 14 | - | |
| 15 | -#endif |