diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:01 -0400 |
commit | 9218b1714949095bff9d9739d80f431d58e561d6 (patch) | |
tree | a107cbf6e36b7910461ab8c018687b36e9d22e3a /arch/um/drivers | |
parent | 24fa6c0832f4513ac897082d7d803970a40cc1b0 (diff) |
uml: remove user_util.h
user_util.h isn't needed any more, so delete it and remove all includes of it.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r-- | arch/um/drivers/chan_kern.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/chan_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/cow_sys.h | 1 | ||||
-rw-r--r-- | arch/um/drivers/daemon_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/fd.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/harddog_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/line.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/mcast_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/mconsole_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/mmapper_kern.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/net_kern.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/net_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/port_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/pty.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/slip_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/slirp_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/ssl.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/stdio_console.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/tty.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/ubd_user.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/xterm.c | 1 |
23 files changed, 0 insertions, 23 deletions
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c index 9fdfad649536..3aa351611763 100644 --- a/arch/um/drivers/chan_kern.c +++ b/arch/um/drivers/chan_kern.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/tty_flip.h> | 12 | #include <linux/tty_flip.h> |
13 | #include <asm/irq.h> | 13 | #include <asm/irq.h> |
14 | #include "chan_kern.h" | 14 | #include "chan_kern.h" |
15 | #include "user_util.h" | ||
16 | #include "kern.h" | 15 | #include "kern.h" |
17 | #include "irq_user.h" | 16 | #include "irq_user.h" |
18 | #include "sigio.h" | 17 | #include "sigio.h" |
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index ed24eab647dd..ee53cf882f42 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <sys/ioctl.h> | 14 | #include <sys/ioctl.h> |
15 | #include <sys/socket.h> | 15 | #include <sys/socket.h> |
16 | #include "kern_util.h" | 16 | #include "kern_util.h" |
17 | #include "user_util.h" | ||
18 | #include "chan_user.h" | 17 | #include "chan_user.h" |
19 | #include "user.h" | 18 | #include "user.h" |
20 | #include "os.h" | 19 | #include "os.h" |
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h index c6a308464acb..c702943769cb 100644 --- a/arch/um/drivers/cow_sys.h +++ b/arch/um/drivers/cow_sys.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define __COW_SYS_H__ | 2 | #define __COW_SYS_H__ |
3 | 3 | ||
4 | #include "kern_util.h" | 4 | #include "kern_util.h" |
5 | #include "user_util.h" | ||
6 | #include "os.h" | 5 | #include "os.h" |
7 | #include "user.h" | 6 | #include "user.h" |
8 | #include "um_malloc.h" | 7 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c index d0b656a517d3..b869e3899683 100644 --- a/arch/um/drivers/daemon_user.c +++ b/arch/um/drivers/daemon_user.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include "net_user.h" | 14 | #include "net_user.h" |
15 | #include "daemon.h" | 15 | #include "daemon.h" |
16 | #include "kern_util.h" | 16 | #include "kern_util.h" |
17 | #include "user_util.h" | ||
18 | #include "user.h" | 17 | #include "user.h" |
19 | #include "os.h" | 18 | #include "os.h" |
20 | #include "um_malloc.h" | 19 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c index 218aa0e9b792..7f083ec47a4f 100644 --- a/arch/um/drivers/fd.c +++ b/arch/um/drivers/fd.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <termios.h> | 9 | #include <termios.h> |
10 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include "user.h" | 11 | #include "user.h" |
12 | #include "user_util.h" | ||
13 | #include "chan_user.h" | 12 | #include "chan_user.h" |
14 | #include "os.h" | 13 | #include "os.h" |
15 | #include "um_malloc.h" | 14 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c index c495ecf263b1..5eeecf8917c3 100644 --- a/arch/um/drivers/harddog_user.c +++ b/arch/um/drivers/harddog_user.c | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <unistd.h> | 7 | #include <unistd.h> |
8 | #include <errno.h> | 8 | #include <errno.h> |
9 | #include "user_util.h" | ||
10 | #include "user.h" | 9 | #include "user.h" |
11 | #include "mconsole.h" | 10 | #include "mconsole.h" |
12 | #include "os.h" | 11 | #include "os.h" |
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index f75d7b05c481..ced99106f798 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include "irq_user.h" | 13 | #include "irq_user.h" |
14 | #include "line.h" | 14 | #include "line.h" |
15 | #include "kern.h" | 15 | #include "kern.h" |
16 | #include "user_util.h" | ||
17 | #include "kern_util.h" | 16 | #include "kern_util.h" |
18 | #include "os.h" | 17 | #include "os.h" |
19 | #include "irq_kern.h" | 18 | #include "irq_kern.h" |
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c index 0f64d9467286..d319db16d4ec 100644 --- a/arch/um/drivers/mcast_user.c +++ b/arch/um/drivers/mcast_user.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include "net_user.h" | 20 | #include "net_user.h" |
21 | #include "mcast.h" | 21 | #include "mcast.h" |
22 | #include "kern_util.h" | 22 | #include "kern_util.h" |
23 | #include "user_util.h" | ||
24 | #include "user.h" | 23 | #include "user.h" |
25 | #include "os.h" | 24 | #include "os.h" |
26 | #include "um_malloc.h" | 25 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 65ad2932672c..542c9ef858f8 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "linux/console.h" | 25 | #include "linux/console.h" |
26 | #include "asm/irq.h" | 26 | #include "asm/irq.h" |
27 | #include "asm/uaccess.h" | 27 | #include "asm/uaccess.h" |
28 | #include "user_util.h" | ||
29 | #include "kern_util.h" | 28 | #include "kern_util.h" |
30 | #include "kern.h" | 29 | #include "kern.h" |
31 | #include "mconsole.h" | 30 | #include "mconsole.h" |
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c index f02634fbf32a..62e5ad63181a 100644 --- a/arch/um/drivers/mconsole_user.c +++ b/arch/um/drivers/mconsole_user.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "sysdep/ptrace.h" | 17 | #include "sysdep/ptrace.h" |
18 | #include "mconsole.h" | 18 | #include "mconsole.h" |
19 | #include "os.h" | 19 | #include "os.h" |
20 | #include "user_util.h" | ||
21 | 20 | ||
22 | static struct mconsole_command commands[] = { | 21 | static struct mconsole_command commands[] = { |
23 | /* With uts namespaces, uts information becomes process-specific, so | 22 | /* With uts namespaces, uts information becomes process-specific, so |
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index df3516e47d4d..e41a08f04694 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/miscdevice.h> | 15 | #include <linux/miscdevice.h> |
16 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
17 | #include "mem_user.h" | 17 | #include "mem_user.h" |
18 | #include "user_util.h" | ||
19 | 18 | ||
20 | /* These are set in mmapper_init, which is called at boot time */ | 19 | /* These are set in mmapper_init, which is called at boot time */ |
21 | static unsigned long mmapper_size; | 20 | static unsigned long mmapper_size; |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index ac746fb5d10f..20963f106c34 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include "linux/ethtool.h" | 21 | #include "linux/ethtool.h" |
22 | #include "linux/platform_device.h" | 22 | #include "linux/platform_device.h" |
23 | #include "asm/uaccess.h" | 23 | #include "asm/uaccess.h" |
24 | #include "user_util.h" | ||
25 | #include "kern_util.h" | 24 | #include "kern_util.h" |
26 | #include "net_kern.h" | 25 | #include "net_kern.h" |
27 | #include "net_user.h" | 26 | #include "net_user.h" |
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index 0ffd7ac295d4..b63a86046374 100644 --- a/arch/um/drivers/net_user.c +++ b/arch/um/drivers/net_user.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <sys/wait.h> | 14 | #include <sys/wait.h> |
15 | #include <sys/time.h> | 15 | #include <sys/time.h> |
16 | #include "user.h" | 16 | #include "user.h" |
17 | #include "user_util.h" | ||
18 | #include "kern_util.h" | 17 | #include "kern_util.h" |
19 | #include "net_user.h" | 18 | #include "net_user.h" |
20 | #include "os.h" | 19 | #include "os.h" |
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c index 80508023054f..3f6357d24bee 100644 --- a/arch/um/drivers/port_user.c +++ b/arch/um/drivers/port_user.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <sys/socket.h> | 13 | #include <sys/socket.h> |
14 | #include <sys/un.h> | 14 | #include <sys/un.h> |
15 | #include <netinet/in.h> | 15 | #include <netinet/in.h> |
16 | #include "user_util.h" | ||
17 | #include "kern_util.h" | 16 | #include "kern_util.h" |
18 | #include "user.h" | 17 | #include "user.h" |
19 | #include "chan_user.h" | 18 | #include "chan_user.h" |
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index aa311afa9667..df4976c9eef2 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <termios.h> | 11 | #include <termios.h> |
12 | #include "chan_user.h" | 12 | #include "chan_user.h" |
13 | #include "user.h" | 13 | #include "user.h" |
14 | #include "user_util.h" | ||
15 | #include "kern_util.h" | 14 | #include "kern_util.h" |
16 | #include "os.h" | 15 | #include "os.h" |
17 | #include "um_malloc.h" | 16 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index 329c072d17d1..9f41cece0916 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <sys/termios.h> | 8 | #include <sys/termios.h> |
9 | #include <sys/wait.h> | 9 | #include <sys/wait.h> |
10 | #include <sys/signal.h> | 10 | #include <sys/signal.h> |
11 | #include "user_util.h" | ||
12 | #include "kern_util.h" | 11 | #include "kern_util.h" |
13 | #include "user.h" | 12 | #include "user.h" |
14 | #include "net_user.h" | 13 | #include "net_user.h" |
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c index f0a40abc8abf..39f889fe9949 100644 --- a/arch/um/drivers/slirp_user.c +++ b/arch/um/drivers/slirp_user.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include <sys/wait.h> | 8 | #include <sys/wait.h> |
9 | #include <sys/signal.h> | 9 | #include <sys/signal.h> |
10 | #include "user_util.h" | ||
11 | #include "kern_util.h" | 10 | #include "kern_util.h" |
12 | #include "user.h" | 11 | #include "user.h" |
13 | #include "net_user.h" | 12 | #include "net_user.h" |
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index 4b382a6e710f..94faadc5ea1b 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include "line.h" | 15 | #include "line.h" |
16 | #include "ssl.h" | 16 | #include "ssl.h" |
17 | #include "chan_kern.h" | 17 | #include "chan_kern.h" |
18 | #include "user_util.h" | ||
19 | #include "kern_util.h" | 18 | #include "kern_util.h" |
20 | #include "kern.h" | 19 | #include "kern.h" |
21 | #include "init.h" | 20 | #include "init.h" |
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 76d1f1c980ef..90a2c5cc17d4 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "stdio_console.h" | 22 | #include "stdio_console.h" |
23 | #include "line.h" | 23 | #include "line.h" |
24 | #include "chan_kern.h" | 24 | #include "chan_kern.h" |
25 | #include "user_util.h" | ||
26 | #include "kern_util.h" | 25 | #include "kern_util.h" |
27 | #include "irq_user.h" | 26 | #include "irq_user.h" |
28 | #include "mconsole_kern.h" | 27 | #include "mconsole_kern.h" |
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c index d95d64309eaf..c07d0d562780 100644 --- a/arch/um/drivers/tty.c +++ b/arch/um/drivers/tty.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <errno.h> | 8 | #include <errno.h> |
9 | #include <unistd.h> | 9 | #include <unistd.h> |
10 | #include "chan_user.h" | 10 | #include "chan_user.h" |
11 | #include "user_util.h" | ||
12 | #include "user.h" | 11 | #include "user.h" |
13 | #include "os.h" | 12 | #include "os.h" |
14 | #include "um_malloc.h" | 13 | #include "um_malloc.h" |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 53c36d1770c5..962b8fb35f80 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include "asm/irq.h" | 39 | #include "asm/irq.h" |
40 | #include "asm/types.h" | 40 | #include "asm/types.h" |
41 | #include "asm/tlbflush.h" | 41 | #include "asm/tlbflush.h" |
42 | #include "user_util.h" | ||
43 | #include "mem_user.h" | 42 | #include "mem_user.h" |
44 | #include "kern_util.h" | 43 | #include "kern_util.h" |
45 | #include "kern.h" | 44 | #include "kern.h" |
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index 039572cbedfe..4707b3f14c2f 100644 --- a/arch/um/drivers/ubd_user.c +++ b/arch/um/drivers/ubd_user.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <sys/mman.h> | 16 | #include <sys/mman.h> |
17 | #include <sys/param.h> | 17 | #include <sys/param.h> |
18 | #include "asm/types.h" | 18 | #include "asm/types.h" |
19 | #include "user_util.h" | ||
20 | #include "kern_util.h" | 19 | #include "kern_util.h" |
21 | #include "user.h" | 20 | #include "user.h" |
22 | #include "ubd_user.h" | 21 | #include "ubd_user.h" |
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index 850221d9b4c9..571c2b3325d5 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <sys/socket.h> | 14 | #include <sys/socket.h> |
15 | #include "kern_util.h" | 15 | #include "kern_util.h" |
16 | #include "chan_user.h" | 16 | #include "chan_user.h" |
17 | #include "user_util.h" | ||
18 | #include "user.h" | 17 | #include "user.h" |
19 | #include "os.h" | 18 | #include "os.h" |
20 | #include "xterm.h" | 19 | #include "xterm.h" |