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>

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 9fdfad649536fbac0c676f84cf46d2bc928485a9..3aa351611763cbcf625f5cc6a09b4f4aad41ea5f 100644 (file)
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -12,7 +12,6 @@
 #include <linux/tty_flip.h>
 #include <asm/irq.h>
 #include "chan_kern.h"
-#include "user_util.h"
 #include "kern.h"
 #include "irq_user.h"
 #include "sigio.h"

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index ed24eab647dd8c0bbfc913cae1425fe62fbb8a85..ee53cf882f42d79a8c1f3753a7c61a48bb0101d9 100644 (file)
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -14,7 +14,6 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include "kern_util.h"
-#include "user_util.h"
 #include "chan_user.h"
 #include "user.h"
 #include "os.h"

diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index c6a308464acb600f3705c4e3a6e0c9fa9c848430..c702943769cbc2148deafe737a08b351f84686ce 100644 (file)
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -2,7 +2,6 @@
 #define __COW_SYS_H__
 
 #include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
 #include "user.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index d0b656a517d3864c2abc9e965ebc2d68199af849..b869e3899683e548d6f98e17ec9959e801ef8a6b 100644 (file)
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -14,7 +14,6 @@
 #include "net_user.h"
 #include "daemon.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 218aa0e9b792b6f0351e084f8640e472ecdf5c9f..7f083ec47a4f03bec098b528b000c1be0fb327d4 100644 (file)
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -9,7 +9,6 @@
 #include <termios.h>
 #include <errno.h>
 #include "user.h"
-#include "user_util.h"
 #include "chan_user.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index c495ecf263b14862b9b9227679416abbf0f0d032..5eeecf8917c3158b31a6ef960a14a7d9312f4d1b 100644 (file)
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#include "user_util.h"
 #include "user.h"
 #include "mconsole.h"
 #include "os.h"

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index f75d7b05c4817c592dce829ec45b3f4b2de307fb..ced99106f7982b84a13eed11a71890f04ba4ae2e 100644 (file)
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -13,7 +13,6 @@
 #include "irq_user.h"
 #include "line.h"
 #include "kern.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "os.h"
 #include "irq_kern.h"

diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index 0f64d9467286169742ba41df30c4f07d6da1efe0..d319db16d4ec30af79eb58f161540d7e68a5d0b2 100644 (file)
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -20,7 +20,6 @@
 #include "net_user.h"
 #include "mcast.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 65ad2932672cad5b4b86dc7504023f8fdcb50c98..542c9ef858f84478c1e75d17a0eeaa48e881912f 100644 (file)
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -25,7 +25,6 @@
 #include "linux/console.h"
 #include "asm/irq.h"
 #include "asm/uaccess.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "mconsole.h"

diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index f02634fbf32ad0e95be61d11c7d911f11a318cd0..62e5ad63181a69c999b61dc40f0e4083c8e1a0ba 100644 (file)
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -17,7 +17,6 @@
 #include "sysdep/ptrace.h"
 #include "mconsole.h"
 #include "os.h"
-#include "user_util.h"
 
 static struct mconsole_command commands[] = {
        /* 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 df3516e47d4d534bae0f10022717cff6bc541297..e41a08f04694ab74b531d31f0c9b50fb0249a3f5 100644 (file)
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -15,7 +15,6 @@
 #include <linux/miscdevice.h>
 #include <asm/uaccess.h>
 #include "mem_user.h"
-#include "user_util.h"
  
 /* These are set in mmapper_init, which is called at boot time */
 static unsigned long mmapper_size;

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index ac746fb5d10f897f751b8249f48020ac3e2ce943..20963f106c3418708ca073caa364e17aea575072 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -21,7 +21,6 @@
 #include "linux/ethtool.h"
 #include "linux/platform_device.h"
 #include "asm/uaccess.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "net_kern.h"
 #include "net_user.h"

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 0ffd7ac295d45e0fd5bdc0e4e8c36eab42c517cd..b63a86046374a3d7440df77b8aff89b055e6f8d3 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -14,7 +14,6 @@
 #include <sys/wait.h>
 #include <sys/time.h>
 #include "user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "net_user.h"
 #include "os.h"

diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 80508023054f27bfc493827eeb3e53cbc864f7b0..3f6357d24bee19bc69a469fec39555a138de9f3a 100644 (file)
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -13,7 +13,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "chan_user.h"

diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index aa311afa966761c90e9229d4c8d6f57fa4ccb864..df4976c9eef223df0f94ca1a27c5aec800b08467 100644 (file)
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -11,7 +11,6 @@
 #include <termios.h>
 #include "chan_user.h"
 #include "user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 329c072d17d152872e23938c3f49c6658502efb5..9f41cece0916cf9573b9ccc4b666009289b836a9 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -8,7 +8,6 @@
 #include <sys/termios.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "net_user.h"

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index f0a40abc8abffcc4fa8cae86560a5a3c2970ba0b..39f889fe994966a54a00b5818bfbf42f77a3c55a 100644 (file)
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "net_user.h"

diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index 4b382a6e710f413dfce8d054f04f60715746e2f4..94faadc5ea1b04c816e39a7323d247a01cc7f6c6 100644 (file)
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -15,7 +15,6 @@
 #include "line.h"
 #include "ssl.h"
 #include "chan_kern.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "init.h"

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 76d1f1c980ef45154e717720e8a83a9ba1c2410c..90a2c5cc17d4e28b64fc34c45a066ebc7f11bbc4 100644 (file)
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -22,7 +22,6 @@
 #include "stdio_console.h"
 #include "line.h"
 #include "chan_kern.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "irq_user.h"
 #include "mconsole_kern.h"

diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index d95d64309eaf3defc373ba6195a0b5fc03cbea45..c07d0d56278029ea8ed040c6cc5b17ce4e520723 100644 (file)
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include "chan_user.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 53c36d1770c5df94167433c29726dee9cafca105..962b8fb35f802a49b88ba2ab62f4120e574f1a79 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -39,7 +39,6 @@
 #include "asm/irq.h"
 #include "asm/types.h"
 #include "asm/tlbflush.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "kern_util.h"
 #include "kern.h"

diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index 039572cbedfecc500ef7f05763f8b04410df9321..4707b3f14c2fcf45029a0c4ae65d84bfad5004e8 100644 (file)
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -16,7 +16,6 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include "asm/types.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "ubd_user.h"

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 850221d9b4c953306d87817bfd455551dc4aee67..571c2b3325d573a1819d47b9d4e69f18a1c40540 100644 (file)
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -14,7 +14,6 @@
 #include <sys/socket.h>
 #include "kern_util.h"
 #include "chan_user.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "xterm.h"

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
deleted file mode 100644 (file)
index 7fa5c68..0000000
--- a/arch/um/include/user_util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __USER_UTIL_H__
-#define __USER_UTIL_H__
-
-#include "sysdep/ptrace.h"
-
-extern int mode_tt;
-
-extern int grantpt(int __fd);
-extern int unlockpt(int __fd);
-
-extern void *add_signal_handler(int sig, void (*handler)(int));
-extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
-extern int switcheroo(int fd, int prot, void *from, void *to, int size);
-extern void do_exec(int old_pid, int new_pid);
-extern void tracer_panic(char *msg, ...)
-       __attribute__ ((format (printf, 1, 2)));
-extern int detach(int pid, int sig);
-extern int attach(int pid);
-extern void kill_child_dead(int pid);
-extern int cont(int pid);
-extern void check_sigio(void);
-extern int raw(int fd);
-
-#endif

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 1ada13ea84e498002f7ef6b87845f8ca948483ce..356e50f5aaed4c6567e8780adbba06f80494e2a2 100644 (file)
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -10,7 +10,6 @@
 #include "asm/pgtable.h"
 #include "asm/tlbflush.h"
 #include "asm/uaccess.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "mem_user.h"

diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
index 8cde431348cc46dccdf80d52d90e4dc1cd3a0b69..cda91aa8e703162564c2163064ed7efe567649d1 100644 (file)
--- a/arch/um/kernel/init_task.c
+++ b/arch/um/kernel/init_task.c
@@ -10,7 +10,6 @@
 #include "linux/mqueue.h"
 #include "asm/uaccess.h"
 #include "asm/pgtable.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "os.h"
 

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 82ecf904b09c8df65fbf234f461f1febecc9b811..6ab1539108e1738c8e8613763e3304c581682ebe 100644 (file)
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -7,7 +7,6 @@
 #include "linux/bootmem.h"
 #include "linux/initrd.h"
 #include "asm/types.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "initrd.h"
 #include "init.h"

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index dbf2f5bc842f69d08026174ad6d00792c8e9b0f1..a1e8c460b755621f1c744bfd4b1329c186c8d1ca 100644 (file)
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -25,7 +25,6 @@
 #include "asm/system.h"
 #include "asm/errno.h"
 #include "asm/uaccess.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "irq_user.h"
 #include "irq_kern.h"

diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 288b4ee2041a579707a558b1f14ce68da660a2e0..7b3e53fb80703f4ced9b1dc5ba0004faa288e44c 100644 (file)
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -17,7 +17,6 @@
 #include "asm/tlbflush.h"
 #include "kern_util.h"
 #include "as-layout.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "os.h"
 

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 3a13d41c28d0daefae7637430b8dd7ac6260455e..5e93bbf6e482b688072f110a90512c8d86e2fb54 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -13,7 +13,6 @@
 #include "asm/page.h"
 #include "asm/fixmap.h"
 #include "asm/pgalloc.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "kern.h"

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index f92f06c35db74aa4202e50fdc3853681ef6bdcc0..df1ad3ba130cd308f7760481466bc552b3fca694 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -14,7 +14,6 @@
 #include "asm/pgtable.h"
 #include "kern_util.h"
 #include "as-layout.h"
-#include "user_util.h"
 #include "mode_kern.h"
 #include "mem.h"
 #include "mem_user.h"

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index e4208386e7afe33168b081b7ecd98b1c2de6bdad..90c9ffafc6591b21eaccc4a8a078b9f51c44c3c8 100644 (file)
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -32,7 +32,6 @@
 #include "asm/tlbflush.h"
 #include "asm/uaccess.h"
 #include "asm/user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "kern.h"

diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index f602623644aa4f44c98e25bbf24bd7408275a25d..7e4305a1fd3c648d91d397a240dde7e8ac659458 100644 (file)
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -6,7 +6,6 @@
 #include "linux/module.h"
 #include "linux/sched.h"
 #include "asm/smp.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "os.h"

diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index 3c798cdde550e513bbf672fb8a5daedb3ed9f8b4..c4020c3d7857e7bae4fa053c61e1565f07a7185e 100644 (file)
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -17,7 +17,6 @@
 #include "asm/signal.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
-#include "user_util.h"
 #include "asm/ucontext.h"
 #include "kern_util.h"
 #include "signal_kern.h"

diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 9c2a7d8c56fb243398d351881915bad0299a619f..ef36facd8fe9a7ff814c81dd1f3976ba3054e019 100644 (file)
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -16,7 +16,6 @@
 #include "as-layout.h"
 #include "skas.h"
 #include "os.h"
-#include "user_util.h"
 #include "tlb.h"
 #include "kern.h"
 #include "mode.h"

diff --git a/arch/um/kernel/skas/tlb.c b/arch/um/kernel/skas/tlb.c
index 27eb29ce666b624a59115df89e173eb32d9a4e39..304a5b0695ab85f0229ad3467ebf364f4da88b65 100644 (file)
--- a/arch/um/kernel/skas/tlb.c
+++ b/arch/um/kernel/skas/tlb.c
@@ -10,7 +10,6 @@
 #include "asm/page.h"
 #include "asm/pgtable.h"
 #include "asm/mmu.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "mem.h"
 #include "skas.h"

diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 759b07053160736a1b0ce8e4220ec3c054197689..62dd093cbcd764f587d0f00a43d356fabbda0200 100644 (file)
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -21,7 +21,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 #include "asm/smp.h"
 #include "asm/processor.h"
 #include "asm/spinlock.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
 #include "irq_user.h"

diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index 2828c52832275fffa7b013e86cb70ea4867363f9..237c4eab7cfd6c429a6ca8831a6a681671a3ddd6 100644 (file)
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -18,7 +18,6 @@
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "sysdep/syscalls.h"
 #include "mode_kern.h"
 #include "choose-mode.h"

diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index f9e02b31a97af3dde7bb23437013d6e628b85761..93263571d813ecf7fc2b8e2212a91f13a621c3f5 100644 (file)
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -10,7 +10,6 @@
 #include "asm/page.h"
 #include "asm/processor.h"
 #include "sysrq.h"
-#include "user_util.h"
 
 /* Catch non-i386 SUBARCH's. */
 #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT)

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index b1f8b0752419d8514763d6ca297674e6e7ceb03e..9fd80ee3eef699367431e5012983c118980d2ac5 100644 (file)
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -18,7 +18,6 @@
 #include "asm/param.h"
 #include "asm/current.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "mode.h"
 #include "os.h"
 

diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
index b8b3cff0668a0be0cfc1c93a4f9407356f43c1ea..e40f3352bd2990312febbd63d2287f575faaecbc 100644 (file)
--- a/arch/um/kernel/tlb.c
+++ b/arch/um/kernel/tlb.c
@@ -10,7 +10,6 @@
 #include "choose-mode.h"
 #include "mode_kern.h"
 #include "as-layout.h"
-#include "user_util.h"
 #include "tlb.h"
 #include "mem.h"
 #include "mem_user.h"

diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 552bcfc7c0859373a50c33d433a377de20d6bdae..2de81d4d9b579bb0b78346cc316af75e8575dffe 100644 (file)
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -18,7 +18,6 @@
 #include "asm/current.h"
 #include "asm/irq.h"
 #include "sysdep/sigcontext.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "arch.h"

diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
index ad66df17d9d75b8a22bd147b8fac97286ccd16f9..98e21743e604046da3e324e43215dd5b38129f62 100644 (file)
--- a/arch/um/kernel/tt/exec_kern.c
+++ b/arch/um/kernel/tt/exec_kern.c
@@ -10,7 +10,6 @@
 #include "asm/uaccess.h"
 #include "asm/pgalloc.h"
 #include "asm/tlbflush.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "irq_user.h"
 #include "mem_user.h"

diff --git a/arch/um/kernel/tt/exec_user.c b/arch/um/kernel/tt/exec_user.c
index a92c02ff2ce30129d52926cb60233edaf711699b..7b5f2181cf5142b569849bafde3ae3b027f6cdc0 100644 (file)
--- a/arch/um/kernel/tt/exec_user.c
+++ b/arch/um/kernel/tt/exec_user.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "ptrace_user.h"

diff --git a/arch/um/kernel/tt/gdb.c b/arch/um/kernel/tt/gdb.c
index d284f69f04ee74b6df33ec09bab8202e3bb4733b..030e4658f36bc5a0d8a39a80724cfba6fd1b3c1d 100644 (file)
--- a/arch/um/kernel/tt/gdb.c
+++ b/arch/um/kernel/tt/gdb.c
@@ -17,7 +17,6 @@
 #include "user.h"
 #include "debug.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "tt.h"
 #include "sysdep/thread.h"
 #include "os.h"

diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c
index 4d1929dfa285ff4c5ed825f883219518a3bf2c75..d0c3c4975f284c26a6a2273e98f841fc9d7d32a9 100644 (file)
--- a/arch/um/kernel/tt/mem.c
+++ b/arch/um/kernel/tt/mem.c
@@ -8,7 +8,6 @@
 #include "asm/uaccess.h"
 #include "mem_user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "kern.h"
 #include "tt.h"
 

diff --git a/arch/um/kernel/tt/mem_user.c b/arch/um/kernel/tt/mem_user.c
index 03e589895388198ce2f15f02ab7bffe798e7a66b..9774f6360c32d97ed18ee08aab92e6e9bc23d103 100644 (file)
--- a/arch/um/kernel/tt/mem_user.c
+++ b/arch/um/kernel/tt/mem_user.c
@@ -11,7 +11,6 @@
 #include <sys/mman.h>
 #include "tt.h"
 #include "mem_user.h"
-#include "user_util.h"
 #include "os.h"
 
 void remap_data(void *segment_start, void *segment_end, int w)

diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index 1e86f0bfef72b3368eacf491db28166293051bcb..8029f72afaa7ae48bf739c995a9a6ea19986fb22 100644 (file)
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -14,7 +14,6 @@
 #include "asm/tlbflush.h"
 #include "irq_user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
 #include "kern.h"
 #include "sigcontext.h"

diff --git a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
index 58800c50b10e5a58e43bef19518232f866a4d9a0..c88e7b5d8a769d5327a449ea4fb869fb786b1680 100644 (file)
--- a/arch/um/kernel/tt/ptproxy/proxy.c
+++ b/arch/um/kernel/tt/ptproxy/proxy.c
@@ -26,7 +26,6 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml
 #include "sysdep.h"
 #include "wait.h"
 
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 #include "tempfile.h"

diff --git a/arch/um/kernel/tt/ptproxy/ptrace.c b/arch/um/kernel/tt/ptproxy/ptrace.c
index 03774427d46865b37d3dffce4dd6d695d4ebb6bc..4b4f6179b21287677f44cad7dd75bfb25d247c73 100644 (file)
--- a/arch/um/kernel/tt/ptproxy/ptrace.c
+++ b/arch/um/kernel/tt/ptproxy/ptrace.c
@@ -16,7 +16,6 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml
 
 #include "ptproxy.h"
 #include "debug.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "ptrace_user.h"
 #include "tt.h"

diff --git a/arch/um/kernel/tt/ptproxy/sysdep.c b/arch/um/kernel/tt/ptproxy/sysdep.c
index 99f178319d0397f4c23a3aaa2f5932c767d9e84e..e0e1ab0588ad0ae075a154e89d6fedc512b07f1c 100644 (file)
--- a/arch/um/kernel/tt/ptproxy/sysdep.c
+++ b/arch/um/kernel/tt/ptproxy/sysdep.c
@@ -13,7 +13,6 @@ terms and conditions.
 #include <sys/types.h>
 #include <linux/unistd.h>
 #include "ptrace_user.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 

diff --git a/arch/um/kernel/tt/ptproxy/wait.c b/arch/um/kernel/tt/ptproxy/wait.c
index 12f6319d8d7690b43553da8440c5d50011d77b57..bdd4af4b65fc84992ed7ec24f2ca1c74c48824d5 100644 (file)
--- a/arch/um/kernel/tt/ptproxy/wait.c
+++ b/arch/um/kernel/tt/ptproxy/wait.c
@@ -13,7 +13,6 @@ terms and conditions.
 #include "ptproxy.h"
 #include "sysdep.h"
 #include "wait.h"
-#include "user_util.h"
 #include "ptrace_user.h"
 #include "sysdep/ptrace.h"
 #include "sysdep/sigcontext.h"

diff --git a/arch/um/kernel/tt/syscall_user.c b/arch/um/kernel/tt/syscall_user.c
index 902987bf379b2c8bd55fed640704255b6e6d02bd..f52b47aff1d2bce2208be7fd42f386c1b720058b 100644 (file)
--- a/arch/um/kernel/tt/syscall_user.c
+++ b/arch/um/kernel/tt/syscall_user.c
@@ -11,7 +11,6 @@
 #include "sigcontext.h"
 #include "ptrace_user.h"
 #include "task.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "syscall.h"
 #include "tt.h"

diff --git a/arch/um/kernel/tt/tlb.c b/arch/um/kernel/tt/tlb.c
index ae6217c86135aca52eff19d919e294a4dd5b86b6..7caa24fe05dfaf376b8cbf77a22cf1acdac10ce5 100644 (file)
--- a/arch/um/kernel/tt/tlb.c
+++ b/arch/um/kernel/tt/tlb.c
@@ -12,7 +12,6 @@
 #include "asm/pgtable.h"
 #include "asm/uaccess.h"
 #include "asm/tlbflush.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "os.h"
 #include "tlb.h"

diff --git a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
index b9195355075ab3e9540dd0e880be38b1cd08556a..c23588393f6e9843281c6458f6280a0f52ea15bf 100644 (file)
--- a/arch/um/kernel/tt/tracer.c
+++ b/arch/um/kernel/tt/tracer.c
@@ -19,7 +19,6 @@
 #include "sigcontext.h"
 #include "sysdep/sigcontext.h"
 #include "os.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "process.h"
 #include "kern_util.h"

diff --git a/arch/um/kernel/tt/trap_user.c b/arch/um/kernel/tt/trap_user.c
index b5d9d64d91e403b82b8d7a6fe525091122b6d9a7..3032eb5e2467a13ae7dca24868a0fc7d20b33506 100644 (file)
--- a/arch/um/kernel/tt/trap_user.c
+++ b/arch/um/kernel/tt/trap_user.c
@@ -8,7 +8,6 @@
 #include <signal.h>
 #include "sysdep/ptrace.h"
 #include "sysdep/sigcontext.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "task.h"
 #include "tt.h"

diff --git a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c
index ed1abcf4d0576584e78e9df965f803ef5030c054..0e5c82c5e5b76244879acdd2d850fbc0ea0884ff 100644 (file)
--- a/arch/um/kernel/tt/uaccess_user.c
+++ b/arch/um/kernel/tt/uaccess_user.c
@@ -5,7 +5,6 @@
  */
 
 #include <string.h>
-#include "user_util.h"
 #include "uml_uaccess.h"
 #include "task.h"
 #include "kern_util.h"

diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 20684c04d5d5a3bc8101d7280405967d184e1b90..cfa35763405fadc1873afdf77e772df1be3e7450 100644 (file)
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -26,7 +26,6 @@
 #include "asm/setup.h"
 #include "ubd_user.h"
 #include "asm/current.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "arch.h"

diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 2cc2d3ea2e6d8a5c684dc7c105baa7f296b96636..4e38ccf3512920a6ad962882c9a6f3f6ab4d1703 100644 (file)
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -16,7 +16,6 @@
 #include <net/if.h>
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "net_user.h"
 #include "etap.h"
 #include "os.h"

diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index 506ef09d83a0f215e6db90ad7663bca954b397b0..11a9779dc9f1dea57cd1c0ac808c16d90d111157 100644 (file)
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -18,7 +18,6 @@
 #include "net_user.h"
 #include "tuntap.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "user.h"
 #include "os.h"
 

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 371b4335f46dd2985fa852ef4a97abccc03080e5..4a9510c67622bcdd24b7b5543082d3b1bbe08d9e 100644 (file)
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -18,7 +18,6 @@
 #include "os.h"
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 
 static void copy_stat(struct uml_stat *dst, struct stat64 *src)
 {

diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index a375cc138c2c6c631748d5fcfae8f864be69b1e2..f35220c72042acc56f548a208645947619f12b5d 100644 (file)
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -13,7 +13,6 @@
 #include <sys/wait.h>
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
 #include "um_malloc.h"
 

diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c
index d1b61d474e0a0a535423f74b097b851bf0b05677..a633fa8e0a944a3a3514d6dd64d909b4946945b2 100644 (file)
--- a/arch/um/os-Linux/irq.c
+++ b/arch/um/os-Linux/irq.c
@@ -11,7 +11,6 @@
 #include <sys/poll.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "process.h"

diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 25261d6c7bf26946de0a52f81ed4249798457437..4b6e122ff17b043667d87d7930aa67bb64b39058 100644 (file)
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -13,7 +13,6 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 #include <asm/page.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "mem_user.h"

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index f1ea169db85e174cf2d6998043bce9d655eef0cd..dcaca0e190de252c8e7d9a64482c9e86666e79bd 100644 (file)
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -11,7 +11,6 @@
 #include <sys/statfs.h>
 #include "kern_util.h"
 #include "user.h"
-#include "user_util.h"
 #include "mem_user.h"
 #include "init.h"
 #include "os.h"

diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 76bdd671241735df114ef75cf0120674acabb163..697828220af2ca249c9937c738bcd0b93655d27c 100644 (file)
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -14,7 +14,6 @@
 #include "ptrace_user.h"
 #include "os.h"
 #include "user.h"
-#include "user_util.h"
 #include "process.h"
 #include "irq_user.h"
 #include "kern_util.h"

diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index c61d01bf46e4427790bae6d1699005929c4d43bd..f77ce3d6f7cc9d0ac3f4d16daf8316621720cbe4 100644 (file)
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -17,7 +17,6 @@
 #include "init.h"
 #include "user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "sigio.h"
 #include "os.h"
 #include "um_malloc.h"

diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 266768629fee6de48152d0674333685a72578021..48d49341530121e004a9efadf4a0637504e3d5ba 100644 (file)
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <sys/mman.h>
-#include "user_util.h"
 #include "user.h"
 #include "signal_kern.h"
 #include "sysdep/sigcontext.h"

diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index 9383e8751ae7721267c910690d0b231958ca2503..470ec531aa5dda4cd92a4baed2b2aa2952f00427 100644 (file)
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -17,7 +17,6 @@
 #include "os.h"
 #include "proc_mm.h"
 #include "ptrace_user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "task.h"
 #include "registers.h"

diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 0564422c155f2601d8329eabe3175bc1c4166e52..6554ff5301281c30876bb628172a9cce9041669f 100644 (file)
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -18,7 +18,6 @@
 #include <asm/types.h>
 #include "user.h"
 #include "sysdep/ptrace.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "skas.h"
 #include "stub-data.h"

diff --git a/arch/um/os-Linux/skas/trap.c b/arch/um/os-Linux/skas/trap.c
index 19ff04bdec90886a2e6a4dcfe498788470adf8df..f104427d2caf345e63d75a1700490cb6e774c551 100644 (file)
--- a/arch/um/os-Linux/skas/trap.c
+++ b/arch/um/os-Linux/skas/trap.c
@@ -5,7 +5,6 @@
 
 #include <signal.h>
 #include <errno.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "as-layout.h"
 #include "task.h"

diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 1540f21d6997902f9413d03068be37c25dcaab3f..3380a13986ef0824303a7d6a0a92f9439bbd92ae 100644 (file)
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -21,7 +21,6 @@
 #include <asm/unistd.h>
 #include <asm/page.h>
 #include <sys/types.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "signal_kern.h"

diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c
index 8ba1324829707c3cda2725180c268ef6d45232d2..32ed41ec1a3d8790d97471f7cae706168f68bb20 100644 (file)
--- a/arch/um/os-Linux/sys-i386/tls.c
+++ b/arch/um/os-Linux/sys-i386/tls.c
@@ -6,7 +6,6 @@
 
 #include "sysdep/tls.h"
 #include "user.h"
-#include "user_util.h"
 
 /* Checks whether host supports TLS, and sets *tls_min according to the value
  * valid on the host.

diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 2115b8beb54167ffe9c522a5fbe6727b1e547137..5de169b168f6d94c9fa360c7ab45ca90371f7c8c 100644 (file)
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -10,7 +10,6 @@
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "process.h"

diff --git a/arch/um/os-Linux/trap.c b/arch/um/os-Linux/trap.c
index d221214d2ed543d1bf6ad9d4462d0ba7b907dfea..295da657931ab54fef6d3f1cb308cf002f0454f7 100644 (file)
--- a/arch/um/os-Linux/trap.c
+++ b/arch/um/os-Linux/trap.c
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <signal.h>
 #include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
 #include "mode.h"
 #include "longjmp.h"

diff --git a/arch/um/os-Linux/tt.c b/arch/um/os-Linux/tt.c
index 3dc3a02d626318ba0337c8471237387099df5729..00e14f446f16417237f83ad541863f7ae91c7ed5 100644 (file)
--- a/arch/um/os-Linux/tt.c
+++ b/arch/um/os-Linux/tt.c
@@ -18,7 +18,6 @@
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "signal_kern.h"

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 125854a2aa2228b77aba8fc28c92f5009e163391..0e771bb04dd215c87b3fde37f979fa0f0c563a0f 100644 (file)
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -21,7 +21,6 @@
 #include <sched.h>
 #include <termios.h>
 #include <string.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "mem_user.h"

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index cae0af14903ac11454c4c982de064a6c78cc8528..0393e44813e775e1adf6e4274789caabb3d09493 100644 (file)
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -13,7 +13,6 @@
 #include "sysdep/ptrace.h"
 #include "task.h"
 #include "os.h"
-#include "user_util.h"
 
 #define MAXTOKEN 64
 

diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 95dd309ff69a84d3ab9dc0b4cc37813e80668472..40ff0c831bd0d7fd3b360a650c38233654d12460 100644 (file)
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -15,7 +15,6 @@
 #include "user.h"
 #include "os.h"
 #include "uml-config.h"
-#include "user_util.h"
 
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {

diff --git a/arch/um/sys-ppc/sigcontext.c b/arch/um/sys-ppc/sigcontext.c
index 5d430fc994afcbbe43101606286b23f53691211c..4bdc15c89eddd3ddd3109404313baf87cffdcd67 100644 (file)
--- a/arch/um/sys-ppc/sigcontext.c
+++ b/arch/um/sys-ppc/sigcontext.c
@@ -1,7 +1,6 @@
 #include "asm/ptrace.h"
 #include "asm/sigcontext.h"
 #include "sysdep/ptrace.h"
-#include "user_util.h"
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.