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/kernel | |
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/kernel')
34 files changed, 0 insertions, 34 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 1ada13ea84e4..356e50f5aaed 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "asm/pgtable.h" | 10 | #include "asm/pgtable.h" |
11 | #include "asm/tlbflush.h" | 11 | #include "asm/tlbflush.h" |
12 | #include "asm/uaccess.h" | 12 | #include "asm/uaccess.h" |
13 | #include "user_util.h" | ||
14 | #include "kern_util.h" | 13 | #include "kern_util.h" |
15 | #include "as-layout.h" | 14 | #include "as-layout.h" |
16 | #include "mem_user.h" | 15 | #include "mem_user.h" |
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index 8cde431348cc..cda91aa8e703 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "linux/mqueue.h" | 10 | #include "linux/mqueue.h" |
11 | #include "asm/uaccess.h" | 11 | #include "asm/uaccess.h" |
12 | #include "asm/pgtable.h" | 12 | #include "asm/pgtable.h" |
13 | #include "user_util.h" | ||
14 | #include "mem_user.h" | 13 | #include "mem_user.h" |
15 | #include "os.h" | 14 | #include "os.h" |
16 | 15 | ||
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index 82ecf904b09c..6ab1539108e1 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include "linux/bootmem.h" | 7 | #include "linux/bootmem.h" |
8 | #include "linux/initrd.h" | 8 | #include "linux/initrd.h" |
9 | #include "asm/types.h" | 9 | #include "asm/types.h" |
10 | #include "user_util.h" | ||
11 | #include "kern_util.h" | 10 | #include "kern_util.h" |
12 | #include "initrd.h" | 11 | #include "initrd.h" |
13 | #include "init.h" | 12 | #include "init.h" |
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index dbf2f5bc842f..a1e8c460b755 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "asm/system.h" | 25 | #include "asm/system.h" |
26 | #include "asm/errno.h" | 26 | #include "asm/errno.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 "irq_user.h" | 29 | #include "irq_user.h" |
31 | #include "irq_kern.h" | 30 | #include "irq_kern.h" |
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 288b4ee2041a..7b3e53fb8070 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "asm/tlbflush.h" | 17 | #include "asm/tlbflush.h" |
18 | #include "kern_util.h" | 18 | #include "kern_util.h" |
19 | #include "as-layout.h" | 19 | #include "as-layout.h" |
20 | #include "user_util.h" | ||
21 | #include "mem_user.h" | 20 | #include "mem_user.h" |
22 | #include "os.h" | 21 | #include "os.h" |
23 | 22 | ||
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 3a13d41c28d0..5e93bbf6e482 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include "asm/page.h" | 13 | #include "asm/page.h" |
14 | #include "asm/fixmap.h" | 14 | #include "asm/fixmap.h" |
15 | #include "asm/pgalloc.h" | 15 | #include "asm/pgalloc.h" |
16 | #include "user_util.h" | ||
17 | #include "kern_util.h" | 16 | #include "kern_util.h" |
18 | #include "as-layout.h" | 17 | #include "as-layout.h" |
19 | #include "kern.h" | 18 | #include "kern.h" |
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index f92f06c35db7..df1ad3ba130c 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include "asm/pgtable.h" | 14 | #include "asm/pgtable.h" |
15 | #include "kern_util.h" | 15 | #include "kern_util.h" |
16 | #include "as-layout.h" | 16 | #include "as-layout.h" |
17 | #include "user_util.h" | ||
18 | #include "mode_kern.h" | 17 | #include "mode_kern.h" |
19 | #include "mem.h" | 18 | #include "mem.h" |
20 | #include "mem_user.h" | 19 | #include "mem_user.h" |
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index e4208386e7af..90c9ffafc659 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include "asm/tlbflush.h" | 32 | #include "asm/tlbflush.h" |
33 | #include "asm/uaccess.h" | 33 | #include "asm/uaccess.h" |
34 | #include "asm/user.h" | 34 | #include "asm/user.h" |
35 | #include "user_util.h" | ||
36 | #include "kern_util.h" | 35 | #include "kern_util.h" |
37 | #include "as-layout.h" | 36 | #include "as-layout.h" |
38 | #include "kern.h" | 37 | #include "kern.h" |
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c index f602623644aa..7e4305a1fd3c 100644 --- a/arch/um/kernel/reboot.c +++ b/arch/um/kernel/reboot.c | |||
@@ -6,7 +6,6 @@ | |||
6 | #include "linux/module.h" | 6 | #include "linux/module.h" |
7 | #include "linux/sched.h" | 7 | #include "linux/sched.h" |
8 | #include "asm/smp.h" | 8 | #include "asm/smp.h" |
9 | #include "user_util.h" | ||
10 | #include "kern_util.h" | 9 | #include "kern_util.h" |
11 | #include "kern.h" | 10 | #include "kern.h" |
12 | #include "os.h" | 11 | #include "os.h" |
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index 3c798cdde550..c4020c3d7857 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "asm/signal.h" | 17 | #include "asm/signal.h" |
18 | #include "asm/uaccess.h" | 18 | #include "asm/uaccess.h" |
19 | #include "asm/unistd.h" | 19 | #include "asm/unistd.h" |
20 | #include "user_util.h" | ||
21 | #include "asm/ucontext.h" | 20 | #include "asm/ucontext.h" |
22 | #include "kern_util.h" | 21 | #include "kern_util.h" |
23 | #include "signal_kern.h" | 22 | #include "signal_kern.h" |
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 9c2a7d8c56fb..ef36facd8fe9 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include "as-layout.h" | 16 | #include "as-layout.h" |
17 | #include "skas.h" | 17 | #include "skas.h" |
18 | #include "os.h" | 18 | #include "os.h" |
19 | #include "user_util.h" | ||
20 | #include "tlb.h" | 19 | #include "tlb.h" |
21 | #include "kern.h" | 20 | #include "kern.h" |
22 | #include "mode.h" | 21 | #include "mode.h" |
diff --git a/arch/um/kernel/skas/tlb.c b/arch/um/kernel/skas/tlb.c index 27eb29ce666b..304a5b0695ab 100644 --- a/arch/um/kernel/skas/tlb.c +++ b/arch/um/kernel/skas/tlb.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "asm/page.h" | 10 | #include "asm/page.h" |
11 | #include "asm/pgtable.h" | 11 | #include "asm/pgtable.h" |
12 | #include "asm/mmu.h" | 12 | #include "asm/mmu.h" |
13 | #include "user_util.h" | ||
14 | #include "mem_user.h" | 13 | #include "mem_user.h" |
15 | #include "mem.h" | 14 | #include "mem.h" |
16 | #include "skas.h" | 15 | #include "skas.h" |
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 759b07053160..62dd093cbcd7 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
@@ -21,7 +21,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
21 | #include "asm/smp.h" | 21 | #include "asm/smp.h" |
22 | #include "asm/processor.h" | 22 | #include "asm/processor.h" |
23 | #include "asm/spinlock.h" | 23 | #include "asm/spinlock.h" |
24 | #include "user_util.h" | ||
25 | #include "kern_util.h" | 24 | #include "kern_util.h" |
26 | #include "kern.h" | 25 | #include "kern.h" |
27 | #include "irq_user.h" | 26 | #include "irq_user.h" |
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index 2828c5283227..237c4eab7cfd 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "asm/mman.h" | 18 | #include "asm/mman.h" |
19 | #include "asm/uaccess.h" | 19 | #include "asm/uaccess.h" |
20 | #include "kern_util.h" | 20 | #include "kern_util.h" |
21 | #include "user_util.h" | ||
22 | #include "sysdep/syscalls.h" | 21 | #include "sysdep/syscalls.h" |
23 | #include "mode_kern.h" | 22 | #include "mode_kern.h" |
24 | #include "choose-mode.h" | 23 | #include "choose-mode.h" |
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index f9e02b31a97a..93263571d813 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "asm/page.h" | 10 | #include "asm/page.h" |
11 | #include "asm/processor.h" | 11 | #include "asm/processor.h" |
12 | #include "sysrq.h" | 12 | #include "sysrq.h" |
13 | #include "user_util.h" | ||
14 | 13 | ||
15 | /* Catch non-i386 SUBARCH's. */ | 14 | /* Catch non-i386 SUBARCH's. */ |
16 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) | 15 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) |
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index b1f8b0752419..9fd80ee3eef6 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "asm/param.h" | 18 | #include "asm/param.h" |
19 | #include "asm/current.h" | 19 | #include "asm/current.h" |
20 | #include "kern_util.h" | 20 | #include "kern_util.h" |
21 | #include "user_util.h" | ||
22 | #include "mode.h" | 21 | #include "mode.h" |
23 | #include "os.h" | 22 | #include "os.h" |
24 | 23 | ||
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index b8b3cff0668a..e40f3352bd29 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "choose-mode.h" | 10 | #include "choose-mode.h" |
11 | #include "mode_kern.h" | 11 | #include "mode_kern.h" |
12 | #include "as-layout.h" | 12 | #include "as-layout.h" |
13 | #include "user_util.h" | ||
14 | #include "tlb.h" | 13 | #include "tlb.h" |
15 | #include "mem.h" | 14 | #include "mem.h" |
16 | #include "mem_user.h" | 15 | #include "mem_user.h" |
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 552bcfc7c085..2de81d4d9b57 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "asm/current.h" | 18 | #include "asm/current.h" |
19 | #include "asm/irq.h" | 19 | #include "asm/irq.h" |
20 | #include "sysdep/sigcontext.h" | 20 | #include "sysdep/sigcontext.h" |
21 | #include "user_util.h" | ||
22 | #include "kern_util.h" | 21 | #include "kern_util.h" |
23 | #include "as-layout.h" | 22 | #include "as-layout.h" |
24 | #include "arch.h" | 23 | #include "arch.h" |
diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c index ad66df17d9d7..98e21743e604 100644 --- a/arch/um/kernel/tt/exec_kern.c +++ b/arch/um/kernel/tt/exec_kern.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "asm/uaccess.h" | 10 | #include "asm/uaccess.h" |
11 | #include "asm/pgalloc.h" | 11 | #include "asm/pgalloc.h" |
12 | #include "asm/tlbflush.h" | 12 | #include "asm/tlbflush.h" |
13 | #include "user_util.h" | ||
14 | #include "kern_util.h" | 13 | #include "kern_util.h" |
15 | #include "irq_user.h" | 14 | #include "irq_user.h" |
16 | #include "mem_user.h" | 15 | #include "mem_user.h" |
diff --git a/arch/um/kernel/tt/exec_user.c b/arch/um/kernel/tt/exec_user.c index a92c02ff2ce3..7b5f2181cf51 100644 --- a/arch/um/kernel/tt/exec_user.c +++ b/arch/um/kernel/tt/exec_user.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include <sys/wait.h> | 11 | #include <sys/wait.h> |
12 | #include <signal.h> | 12 | #include <signal.h> |
13 | #include "user_util.h" | ||
14 | #include "kern_util.h" | 13 | #include "kern_util.h" |
15 | #include "user.h" | 14 | #include "user.h" |
16 | #include "ptrace_user.h" | 15 | #include "ptrace_user.h" |
diff --git a/arch/um/kernel/tt/gdb.c b/arch/um/kernel/tt/gdb.c index d284f69f04ee..030e4658f36b 100644 --- a/arch/um/kernel/tt/gdb.c +++ b/arch/um/kernel/tt/gdb.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "user.h" | 17 | #include "user.h" |
18 | #include "debug.h" | 18 | #include "debug.h" |
19 | #include "kern_util.h" | 19 | #include "kern_util.h" |
20 | #include "user_util.h" | ||
21 | #include "tt.h" | 20 | #include "tt.h" |
22 | #include "sysdep/thread.h" | 21 | #include "sysdep/thread.h" |
23 | #include "os.h" | 22 | #include "os.h" |
diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c index 4d1929dfa285..d0c3c4975f28 100644 --- a/arch/um/kernel/tt/mem.c +++ b/arch/um/kernel/tt/mem.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include "asm/uaccess.h" | 8 | #include "asm/uaccess.h" |
9 | #include "mem_user.h" | 9 | #include "mem_user.h" |
10 | #include "kern_util.h" | 10 | #include "kern_util.h" |
11 | #include "user_util.h" | ||
12 | #include "kern.h" | 11 | #include "kern.h" |
13 | #include "tt.h" | 12 | #include "tt.h" |
14 | 13 | ||
diff --git a/arch/um/kernel/tt/mem_user.c b/arch/um/kernel/tt/mem_user.c index 03e589895388..9774f6360c32 100644 --- a/arch/um/kernel/tt/mem_user.c +++ b/arch/um/kernel/tt/mem_user.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <sys/mman.h> | 11 | #include <sys/mman.h> |
12 | #include "tt.h" | 12 | #include "tt.h" |
13 | #include "mem_user.h" | 13 | #include "mem_user.h" |
14 | #include "user_util.h" | ||
15 | #include "os.h" | 14 | #include "os.h" |
16 | 15 | ||
17 | void remap_data(void *segment_start, void *segment_end, int w) | 16 | 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 1e86f0bfef72..8029f72afaa7 100644 --- a/arch/um/kernel/tt/process_kern.c +++ b/arch/um/kernel/tt/process_kern.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include "asm/tlbflush.h" | 14 | #include "asm/tlbflush.h" |
15 | #include "irq_user.h" | 15 | #include "irq_user.h" |
16 | #include "kern_util.h" | 16 | #include "kern_util.h" |
17 | #include "user_util.h" | ||
18 | #include "os.h" | 17 | #include "os.h" |
19 | #include "kern.h" | 18 | #include "kern.h" |
20 | #include "sigcontext.h" | 19 | #include "sigcontext.h" |
diff --git a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c index 58800c50b10e..c88e7b5d8a76 100644 --- 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 | |||
26 | #include "sysdep.h" | 26 | #include "sysdep.h" |
27 | #include "wait.h" | 27 | #include "wait.h" |
28 | 28 | ||
29 | #include "user_util.h" | ||
30 | #include "user.h" | 29 | #include "user.h" |
31 | #include "os.h" | 30 | #include "os.h" |
32 | #include "tempfile.h" | 31 | #include "tempfile.h" |
diff --git a/arch/um/kernel/tt/ptproxy/ptrace.c b/arch/um/kernel/tt/ptproxy/ptrace.c index 03774427d468..4b4f6179b212 100644 --- 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 | |||
16 | 16 | ||
17 | #include "ptproxy.h" | 17 | #include "ptproxy.h" |
18 | #include "debug.h" | 18 | #include "debug.h" |
19 | #include "user_util.h" | ||
20 | #include "kern_util.h" | 19 | #include "kern_util.h" |
21 | #include "ptrace_user.h" | 20 | #include "ptrace_user.h" |
22 | #include "tt.h" | 21 | #include "tt.h" |
diff --git a/arch/um/kernel/tt/ptproxy/sysdep.c b/arch/um/kernel/tt/ptproxy/sysdep.c index 99f178319d03..e0e1ab0588ad 100644 --- a/arch/um/kernel/tt/ptproxy/sysdep.c +++ b/arch/um/kernel/tt/ptproxy/sysdep.c | |||
@@ -13,7 +13,6 @@ terms and conditions. | |||
13 | #include <sys/types.h> | 13 | #include <sys/types.h> |
14 | #include <linux/unistd.h> | 14 | #include <linux/unistd.h> |
15 | #include "ptrace_user.h" | 15 | #include "ptrace_user.h" |
16 | #include "user_util.h" | ||
17 | #include "user.h" | 16 | #include "user.h" |
18 | #include "os.h" | 17 | #include "os.h" |
19 | 18 | ||
diff --git a/arch/um/kernel/tt/ptproxy/wait.c b/arch/um/kernel/tt/ptproxy/wait.c index 12f6319d8d76..bdd4af4b65fc 100644 --- a/arch/um/kernel/tt/ptproxy/wait.c +++ b/arch/um/kernel/tt/ptproxy/wait.c | |||
@@ -13,7 +13,6 @@ terms and conditions. | |||
13 | #include "ptproxy.h" | 13 | #include "ptproxy.h" |
14 | #include "sysdep.h" | 14 | #include "sysdep.h" |
15 | #include "wait.h" | 15 | #include "wait.h" |
16 | #include "user_util.h" | ||
17 | #include "ptrace_user.h" | 16 | #include "ptrace_user.h" |
18 | #include "sysdep/ptrace.h" | 17 | #include "sysdep/ptrace.h" |
19 | #include "sysdep/sigcontext.h" | 18 | #include "sysdep/sigcontext.h" |
diff --git a/arch/um/kernel/tt/syscall_user.c b/arch/um/kernel/tt/syscall_user.c index 902987bf379b..f52b47aff1d2 100644 --- a/arch/um/kernel/tt/syscall_user.c +++ b/arch/um/kernel/tt/syscall_user.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include "sigcontext.h" | 11 | #include "sigcontext.h" |
12 | #include "ptrace_user.h" | 12 | #include "ptrace_user.h" |
13 | #include "task.h" | 13 | #include "task.h" |
14 | #include "user_util.h" | ||
15 | #include "kern_util.h" | 14 | #include "kern_util.h" |
16 | #include "syscall.h" | 15 | #include "syscall.h" |
17 | #include "tt.h" | 16 | #include "tt.h" |
diff --git a/arch/um/kernel/tt/tlb.c b/arch/um/kernel/tt/tlb.c index ae6217c86135..7caa24fe05df 100644 --- a/arch/um/kernel/tt/tlb.c +++ b/arch/um/kernel/tt/tlb.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include "asm/pgtable.h" | 12 | #include "asm/pgtable.h" |
13 | #include "asm/uaccess.h" | 13 | #include "asm/uaccess.h" |
14 | #include "asm/tlbflush.h" | 14 | #include "asm/tlbflush.h" |
15 | #include "user_util.h" | ||
16 | #include "mem_user.h" | 15 | #include "mem_user.h" |
17 | #include "os.h" | 16 | #include "os.h" |
18 | #include "tlb.h" | 17 | #include "tlb.h" |
diff --git a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c index b9195355075a..c23588393f6e 100644 --- a/arch/um/kernel/tt/tracer.c +++ b/arch/um/kernel/tt/tracer.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include "sigcontext.h" | 19 | #include "sigcontext.h" |
20 | #include "sysdep/sigcontext.h" | 20 | #include "sysdep/sigcontext.h" |
21 | #include "os.h" | 21 | #include "os.h" |
22 | #include "user_util.h" | ||
23 | #include "mem_user.h" | 22 | #include "mem_user.h" |
24 | #include "process.h" | 23 | #include "process.h" |
25 | #include "kern_util.h" | 24 | #include "kern_util.h" |
diff --git a/arch/um/kernel/tt/trap_user.c b/arch/um/kernel/tt/trap_user.c index b5d9d64d91e4..3032eb5e2467 100644 --- a/arch/um/kernel/tt/trap_user.c +++ b/arch/um/kernel/tt/trap_user.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <signal.h> | 8 | #include <signal.h> |
9 | #include "sysdep/ptrace.h" | 9 | #include "sysdep/ptrace.h" |
10 | #include "sysdep/sigcontext.h" | 10 | #include "sysdep/sigcontext.h" |
11 | #include "user_util.h" | ||
12 | #include "kern_util.h" | 11 | #include "kern_util.h" |
13 | #include "task.h" | 12 | #include "task.h" |
14 | #include "tt.h" | 13 | #include "tt.h" |
diff --git a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c index ed1abcf4d057..0e5c82c5e5b7 100644 --- a/arch/um/kernel/tt/uaccess_user.c +++ b/arch/um/kernel/tt/uaccess_user.c | |||
@@ -5,7 +5,6 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <string.h> | 7 | #include <string.h> |
8 | #include "user_util.h" | ||
9 | #include "uml_uaccess.h" | 8 | #include "uml_uaccess.h" |
10 | #include "task.h" | 9 | #include "task.h" |
11 | #include "kern_util.h" | 10 | #include "kern_util.h" |
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 20684c04d5d5..cfa35763405f 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "asm/setup.h" | 26 | #include "asm/setup.h" |
27 | #include "ubd_user.h" | 27 | #include "ubd_user.h" |
28 | #include "asm/current.h" | 28 | #include "asm/current.h" |
29 | #include "user_util.h" | ||
30 | #include "kern_util.h" | 29 | #include "kern_util.h" |
31 | #include "as-layout.h" | 30 | #include "as-layout.h" |
32 | #include "arch.h" | 31 | #include "arch.h" |