28 files changed, 122 insertions, 122 deletions
diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c
index 91ea538e1612..1fb12235ab9c 100644
--- a/arch/um/kernel/asm-offsets.c
+++ b/arch/um/kernel/asm-offsets.c
@@ -1 +1 @@
-#include "sysdep/kernel-offsets.h"
+#include <sysdep/kernel-offsets.h>
diff --git a/arch/um/kernel/config.c.in b/arch/um/kernel/config.c.in
index b7a43feafde7..972bf1659564 100644
--- a/arch/um/kernel/config.c.in
+++ b/arch/um/kernel/config.c.in
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "init.h"
+#include <init.h>
 static __initdata const char *config[] = {
 "CONFIG"
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index a3cab6d3ae02..fb8fd6fb6563 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -89,7 +89,7 @@ SECTIONS
  .kstrtab : { *(.kstrtab) }
-  #include "asm/common.lds.S"
+  #include <asm/common.lds.S>
  init.data : { INIT_DATA }
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c
index ec649bf72f68..49480f092456 100644
--- a/arch/um/kernel/early_printk.c
+++ b/arch/um/kernel/early_printk.c
@@ -9,7 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/console.h>
 #include <linux/init.h>
-#include "os.h"
+#include <os.h>
 static void early_console_write(struct console *con, const char *s, unsigned int n)
 {
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 8c82786da823..de66c421ae9d 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -12,10 +12,10 @@
 #include <asm/current.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "mem_user.h"
+#include <mem_user.h>
-#include "skas.h"
+#include <skas.h>
-#include "os.h"
+#include <os.h>
 #include "internal.h"
 void flush_thread(void)
diff --git a/arch/um/kernel/gmon_syms.c b/arch/um/kernel/gmon_syms.c
index e9bcf247bcee..1bf61266da8e 100644
--- a/arch/um/kernel/gmon_syms.c
+++ b/arch/um/kernel/gmon_syms.c
@@ -3,7 +3,7 @@
 * Licensed under the GPL
 */
-#include "linux/module.h"
+#include <linux/module.h>
 extern void __bb_init_func(void *)  __attribute__((weak));
 EXPORT_SYMBOL(__bb_init_func);
diff --git a/arch/um/kernel/gprof_syms.c b/arch/um/kernel/gprof_syms.c
index e2f043d0de6c..74ddb44288a3 100644
--- a/arch/um/kernel/gprof_syms.c
+++ b/arch/um/kernel/gprof_syms.c
@@ -3,7 +3,7 @@
 * Licensed under the GPL
 */
-#include "linux/module.h"
+#include <linux/module.h>
 extern void mcount(void);
 EXPORT_SYMBOL(mcount);
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 10cc18f729fd..55cead809b18 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -3,12 +3,12 @@
 * Licensed under the GPL
 */
-#include "linux/init.h"
+#include <linux/init.h>
-#include "linux/bootmem.h"
+#include <linux/bootmem.h>
-#include "linux/initrd.h"
+#include <linux/initrd.h>
-#include "asm/types.h"
+#include <asm/types.h>
-#include "init.h"
+#include <init.h>
-#include "os.h"
+#include <os.h>
 /* Changed by uml_initrd_setup, which is a setup */
 static char *initrd __initdata = NULL;
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 9883026f0730..36e12f0cefd5 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -5,17 +5,17 @@
 *      Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
 */
-#include "linux/cpumask.h"
+#include <linux/cpumask.h>
-#include "linux/hardirq.h"
+#include <linux/hardirq.h>
-#include "linux/interrupt.h"
+#include <linux/interrupt.h>
-#include "linux/kernel_stat.h"
+#include <linux/kernel_stat.h>
-#include "linux/module.h"
+#include <linux/module.h>
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "linux/seq_file.h"
+#include <linux/seq_file.h>
-#include "linux/slab.h"
+#include <linux/slab.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
 /*
 * This list is accessed under irq_lock, except in sigio_handler,
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index e17bea0b22e1..543c04756939 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -4,7 +4,7 @@
 */
 #include <linux/module.h>
-#include "os.h"
+#include <os.h>
 EXPORT_SYMBOL(set_signals);
 EXPORT_SYMBOL(get_signals);
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index ebb86b218445..5abcbfbe7e25 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -12,12 +12,12 @@
 #include <linux/slab.h>
 #include <asm/fixmap.h>
 #include <asm/page.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "init.h"
+#include <init.h>
-#include "kern.h"
+#include <kern.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "mem_user.h"
+#include <mem_user.h>
-#include "os.h"
+#include <os.h>
 /* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
 unsigned long *empty_zero_page = NULL;
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index c5f5afa50745..41f53240e794 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -23,10 +23,10 @@
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
 #include <asm/uaccess.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 /*
 * This is a per-cpu array.  A processor only modifies its entry and it only
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 3d15243ce692..ced8903921ae 100644
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -3,13 +3,13 @@
 * Licensed under the GPL
 */
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "linux/spinlock.h"
+#include <linux/spinlock.h>
-#include "linux/slab.h"
+#include <linux/slab.h>
-#include "linux/oom.h"
+#include <linux/oom.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 void (*pm_power_off)(void);
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index c88211139a51..b5e0cbb34382 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -4,9 +4,9 @@
 */
 #include <linux/interrupt.h>
-#include "irq_kern.h"
+#include <irq_kern.h>
-#include "os.h"
+#include <os.h>
-#include "sigio.h"
+#include <sigio.h>
 /* Protected by sigio_lock() called from write_sigio_workaround */
 static int sigio_irq_fd = -1;
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index cc9c2350e417..db18eb6124e1 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -9,8 +9,8 @@
 #include <asm/siginfo.h>
 #include <asm/signal.h>
 #include <asm/unistd.h>
-#include "frame_kern.h"
+#include <frame_kern.h>
-#include "kern_util.h"
+#include <kern_util.h>
 EXPORT_SYMBOL(block_signals);
 EXPORT_SYMBOL(unblock_signals);
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index e1fd066a3525..289771dadf81 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -7,10 +7,10 @@
 #include <sched.h>
 #include <asm/unistd.h>
 #include <sys/time.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "ptrace_user.h"
+#include <ptrace_user.h>
-#include "stub-data.h"
+#include <stub-data.h>
-#include "sysdep/stub.h"
+#include <sysdep/stub.h>
 /*
 * This is in a separate file because it needs to be compiled with any
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 0a49ef0c2bf4..ff03067a3b14 100644
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -3,14 +3,14 @@
 * Licensed under the GPL
 */
-#include "linux/mm.h"
+#include <linux/mm.h>
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "linux/slab.h"
+#include <linux/slab.h>
-#include "asm/pgalloc.h"
+#include <asm/pgalloc.h>
-#include "asm/pgtable.h"
+#include <asm/pgtable.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 extern int __syscall_stub_start;
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 0a9e57e7446b..4da11b3c8ddb 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -3,12 +3,12 @@
 * Licensed under the GPL
 */
-#include "linux/init.h"
+#include <linux/init.h>
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "kern.h"
+#include <kern.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 int new_mm(unsigned long stack)
 {
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 86368a025a96..c0681e097432 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -3,11 +3,11 @@
 * Licensed under the GPL
 */
-#include "linux/kernel.h"
+#include <linux/kernel.h>
-#include "linux/ptrace.h"
+#include <linux/ptrace.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "sysdep/ptrace.h"
+#include <sysdep/ptrace.h>
-#include "sysdep/syscalls.h"
+#include <sysdep/syscalls.h>
 extern int syscall_table_size;
 #define NR_SYSCALLS (syscall_table_size / sizeof(void *))
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index cd7df79c6a56..1d3e0c17340b 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -11,8 +11,8 @@
 #include <asm/current.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
 pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
 {
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index a02b7e9e6b94..5c8c3ea7db7b 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -3,24 +3,24 @@
 * Licensed under the GPL
 */
-#include "linux/percpu.h"
+#include <linux/percpu.h>
-#include "asm/pgalloc.h"
+#include <asm/pgalloc.h>
-#include "asm/tlb.h"
+#include <asm/tlb.h>
 #ifdef CONFIG_SMP
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "linux/module.h"
+#include <linux/module.h>
-#include "linux/threads.h"
+#include <linux/threads.h>
-#include "linux/interrupt.h"
+#include <linux/interrupt.h>
-#include "linux/err.h"
+#include <linux/err.h>
-#include "linux/hardirq.h"
+#include <linux/hardirq.h>
-#include "asm/smp.h"
+#include <asm/smp.h>
-#include "asm/processor.h"
+#include <asm/processor.h>
-#include "asm/spinlock.h"
+#include <asm/spinlock.h>
-#include "kern.h"
+#include <kern.h>
-#include "irq_user.h"
+#include <irq_user.h>
-#include "os.h"
+#include <os.h>
 /* Per CPU bogomips and other parameters
 * The only piece used here is the ipi pipe, which is set before SMP is
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index a4c6d8eee74c..10808bda3671 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -3,16 +3,16 @@
 * Licensed under the GPL
 */
-#include "linux/file.h"
+#include <linux/file.h>
-#include "linux/fs.h"
+#include <linux/fs.h>
-#include "linux/mm.h"
+#include <linux/mm.h>
-#include "linux/sched.h"
+#include <linux/sched.h>
-#include "linux/utsname.h"
+#include <linux/utsname.h>
-#include "linux/syscalls.h"
+#include <linux/syscalls.h>
-#include "asm/current.h"
+#include <asm/current.h>
-#include "asm/mman.h"
+#include <asm/mman.h>
-#include "asm/uaccess.h"
+#include <asm/uaccess.h>
-#include "asm/unistd.h"
+#include <asm/unistd.h>
 #include "internal.h"
 long sys_fork(void)
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 5f76d4ba151c..117568d4f64a 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -10,8 +10,8 @@
 #include <linux/threads.h>
 #include <asm/irq.h>
 #include <asm/param.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
 void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 {
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
index f819af951c19..9472079471bb 100644
--- a/arch/um/kernel/tlb.c
+++ b/arch/um/kernel/tlb.c
@@ -8,10 +8,10 @@
 #include <linux/sched.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "mem_user.h"
+#include <mem_user.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 struct host_vm_change {
        struct host_vm_op {
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 0353b98ae35a..cf7585fbc9fa 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -10,11 +10,11 @@
 #include <asm/current.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
-#include "arch.h"
+#include <arch.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "os.h"
+#include <os.h>
-#include "skas.h"
+#include <skas.h>
 /*
 * Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 4db8770906ca..87df5e3acc26 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -14,13 +14,13 @@
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/setup.h>
-#include "as-layout.h"
+#include <as-layout.h>
-#include "arch.h"
+#include <arch.h>
-#include "init.h"
+#include <init.h>
-#include "kern.h"
+#include <kern.h>
-#include "kern_util.h"
+#include <kern_util.h>
-#include "mem_user.h"
+#include <mem_user.h>
-#include "os.h"
+#include <os.h>
 #define DEFAULT_COMMAND_LINE "root=98:0"
diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
index 81e07e2be3ae..f6cc3bd61781 100644
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
@@ -4,9 +4,9 @@
 */
 #include <asm/errno.h>
-#include "init.h"
+#include <init.h>
-#include "kern.h"
+#include <kern.h>
-#include "os.h"
+#include <os.h>
 /* Changed by set_umid_arg */
 static int umid_inited = 0;
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index fbd99402d4d2..ff65fb4f1a95 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -60,7 +60,7 @@ SECTIONS
        PROVIDE_HIDDEN(__rela_iplt_end = .);
  }
-  #include "asm/common.lds.S"
+  #include <asm/common.lds.S>
  init.data : { INIT_DATA }
  .data    :

diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c index 91ea538e1612..1fb12235ab9c 100644 --- a/arch/um/kernel/asm-offsets.c +++ b/arch/um/kernel/asm-offsets.c
@@ -1 +1 @@
	#include "sysdep/kernel-offsets.h"		#include <sysdep/kernel-offsets.h>


diff --git a/arch/um/kernel/config.c.in b/arch/um/kernel/config.c.in index b7a43feafde7..972bf1659564 100644 --- a/arch/um/kernel/config.c.in +++ b/arch/um/kernel/config.c.in
@@ -5,7 +5,7 @@
5		5
6	#include <stdio.h>	6	#include <stdio.h>
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include "init.h"	8	#include <init.h>
9		9
10	static __initdata const char *config[] = {	10	static __initdata const char *config[] = {
11	"CONFIG"	11	"CONFIG"


diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index a3cab6d3ae02..fb8fd6fb6563 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S
@@ -89,7 +89,7 @@ SECTIONS
89		89
90	.kstrtab : { *(.kstrtab) }	90	.kstrtab : { *(.kstrtab) }
91		91
92	#include "asm/common.lds.S"	92	#include <asm/common.lds.S>
93		93
94	init.data : { INIT_DATA }	94	init.data : { INIT_DATA }
95		95


diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c index ec649bf72f68..49480f092456 100644 --- a/arch/um/kernel/early_printk.c +++ b/arch/um/kernel/early_printk.c
@@ -9,7 +9,7 @@
9	#include <linux/kernel.h>	9	#include <linux/kernel.h>
10	#include <linux/console.h>	10	#include <linux/console.h>
11	#include <linux/init.h>	11	#include <linux/init.h>
12	#include "os.h"	12	#include <os.h>
13		13
14	static void early_console_write(struct console con, const char s, unsigned int n)	14	static void early_console_write(struct console con, const char s, unsigned int n)
15	{	15	{


diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 8c82786da823..de66c421ae9d 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c
@@ -12,10 +12,10 @@
12	#include <asm/current.h>	12	#include <asm/current.h>
13	#include <asm/processor.h>	13	#include <asm/processor.h>
14	#include <asm/uaccess.h>	14	#include <asm/uaccess.h>
15	#include "as-layout.h"	15	#include <as-layout.h>
16	#include "mem_user.h"	16	#include <mem_user.h>
17	#include "skas.h"	17	#include <skas.h>
18	#include "os.h"	18	#include <os.h>
19	#include "internal.h"	19	#include "internal.h"
20		20
21	void flush_thread(void)	21	void flush_thread(void)


diff --git a/arch/um/kernel/gmon_syms.c b/arch/um/kernel/gmon_syms.c index e9bcf247bcee..1bf61266da8e 100644 --- a/arch/um/kernel/gmon_syms.c +++ b/arch/um/kernel/gmon_syms.c
@@ -3,7 +3,7 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/module.h"	6	#include <linux/module.h>
7		7
8	extern void __bb_init_func(void *) __attribute__((weak));	8	extern void __bb_init_func(void *) __attribute__((weak));
9	EXPORT_SYMBOL(__bb_init_func);	9	EXPORT_SYMBOL(__bb_init_func);


diff --git a/arch/um/kernel/gprof_syms.c b/arch/um/kernel/gprof_syms.c index e2f043d0de6c..74ddb44288a3 100644 --- a/arch/um/kernel/gprof_syms.c +++ b/arch/um/kernel/gprof_syms.c
@@ -3,7 +3,7 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/module.h"	6	#include <linux/module.h>
7		7
8	extern void mcount(void);	8	extern void mcount(void);
9	EXPORT_SYMBOL(mcount);	9	EXPORT_SYMBOL(mcount);


diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index 10cc18f729fd..55cead809b18 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c
@@ -3,12 +3,12 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/init.h"	6	#include <linux/init.h>
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 "init.h"	10	#include <init.h>
11	#include "os.h"	11	#include <os.h>
12		12
13	/* Changed by uml_initrd_setup, which is a setup */	13	/* Changed by uml_initrd_setup, which is a setup */
14	static char *initrd __initdata = NULL;	14	static char *initrd __initdata = NULL;


diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 9883026f0730..36e12f0cefd5 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c
@@ -5,17 +5,17 @@
5	* Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar	5	* Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
6	*/	6	*/
7		7
8	#include "linux/cpumask.h"	8	#include <linux/cpumask.h>
9	#include "linux/hardirq.h"	9	#include <linux/hardirq.h>
10	#include "linux/interrupt.h"	10	#include <linux/interrupt.h>
11	#include "linux/kernel_stat.h"	11	#include <linux/kernel_stat.h>
12	#include "linux/module.h"	12	#include <linux/module.h>
13	#include "linux/sched.h"	13	#include <linux/sched.h>
14	#include "linux/seq_file.h"	14	#include <linux/seq_file.h>
15	#include "linux/slab.h"	15	#include <linux/slab.h>
16	#include "as-layout.h"	16	#include <as-layout.h>
17	#include "kern_util.h"	17	#include <kern_util.h>
18	#include "os.h"	18	#include <os.h>
19		19
20	/*	20	/*
21	* This list is accessed under irq_lock, except in sigio_handler,	21	* This list is accessed under irq_lock, except in sigio_handler,


diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index e17bea0b22e1..543c04756939 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c
@@ -4,7 +4,7 @@
4	*/	4	*/
5		5
6	#include <linux/module.h>	6	#include <linux/module.h>
7	#include "os.h"	7	#include <os.h>
8		8
9	EXPORT_SYMBOL(set_signals);	9	EXPORT_SYMBOL(set_signals);
10	EXPORT_SYMBOL(get_signals);	10	EXPORT_SYMBOL(get_signals);


diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index ebb86b218445..5abcbfbe7e25 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c
@@ -12,12 +12,12 @@
12	#include <linux/slab.h>	12	#include <linux/slab.h>
13	#include <asm/fixmap.h>	13	#include <asm/fixmap.h>
14	#include <asm/page.h>	14	#include <asm/page.h>
15	#include "as-layout.h"	15	#include <as-layout.h>
16	#include "init.h"	16	#include <init.h>
17	#include "kern.h"	17	#include <kern.h>
18	#include "kern_util.h"	18	#include <kern_util.h>
19	#include "mem_user.h"	19	#include <mem_user.h>
20	#include "os.h"	20	#include <os.h>
21		21
22	/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */	22	/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
23	unsigned long *empty_zero_page = NULL;	23	unsigned long *empty_zero_page = NULL;


diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index c5f5afa50745..41f53240e794 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c
@@ -23,10 +23,10 @@
23	#include <asm/pgtable.h>	23	#include <asm/pgtable.h>
24	#include <asm/mmu_context.h>	24	#include <asm/mmu_context.h>
25	#include <asm/uaccess.h>	25	#include <asm/uaccess.h>
26	#include "as-layout.h"	26	#include <as-layout.h>
27	#include "kern_util.h"	27	#include <kern_util.h>
28	#include "os.h"	28	#include <os.h>
29	#include "skas.h"	29	#include <skas.h>
30		30
31	/*	31	/*
32	* This is a per-cpu array. A processor only modifies its entry and it only	32	* This is a per-cpu array. A processor only modifies its entry and it only


diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c index 3d15243ce692..ced8903921ae 100644 --- a/arch/um/kernel/reboot.c +++ b/arch/um/kernel/reboot.c
@@ -3,13 +3,13 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/sched.h"	6	#include <linux/sched.h>
7	#include "linux/spinlock.h"	7	#include <linux/spinlock.h>
8	#include "linux/slab.h"	8	#include <linux/slab.h>
9	#include "linux/oom.h"	9	#include <linux/oom.h>
10	#include "kern_util.h"	10	#include <kern_util.h>
11	#include "os.h"	11	#include <os.h>
12	#include "skas.h"	12	#include <skas.h>
13		13
14	void (*pm_power_off)(void);	14	void (*pm_power_off)(void);
15		15


diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c index c88211139a51..b5e0cbb34382 100644 --- a/arch/um/kernel/sigio.c +++ b/arch/um/kernel/sigio.c
@@ -4,9 +4,9 @@
4	*/	4	*/
5		5
6	#include <linux/interrupt.h>	6	#include <linux/interrupt.h>
7	#include "irq_kern.h"	7	#include <irq_kern.h>
8	#include "os.h"	8	#include <os.h>
9	#include "sigio.h"	9	#include <sigio.h>
10		10
11	/* Protected by sigio_lock() called from write_sigio_workaround */	11	/* Protected by sigio_lock() called from write_sigio_workaround */
12	static int sigio_irq_fd = -1;	12	static int sigio_irq_fd = -1;


diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index cc9c2350e417..db18eb6124e1 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c
@@ -9,8 +9,8 @@
9	#include <asm/siginfo.h>	9	#include <asm/siginfo.h>
10	#include <asm/signal.h>	10	#include <asm/signal.h>
11	#include <asm/unistd.h>	11	#include <asm/unistd.h>
12	#include "frame_kern.h"	12	#include <frame_kern.h>
13	#include "kern_util.h"	13	#include <kern_util.h>
14		14
15	EXPORT_SYMBOL(block_signals);	15	EXPORT_SYMBOL(block_signals);
16	EXPORT_SYMBOL(unblock_signals);	16	EXPORT_SYMBOL(unblock_signals);


diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c index e1fd066a3525..289771dadf81 100644 --- a/arch/um/kernel/skas/clone.c +++ b/arch/um/kernel/skas/clone.c
@@ -7,10 +7,10 @@
7	#include <sched.h>	7	#include <sched.h>
8	#include <asm/unistd.h>	8	#include <asm/unistd.h>
9	#include <sys/time.h>	9	#include <sys/time.h>
10	#include "as-layout.h"	10	#include <as-layout.h>
11	#include "ptrace_user.h"	11	#include <ptrace_user.h>
12	#include "stub-data.h"	12	#include <stub-data.h>
13	#include "sysdep/stub.h"	13	#include <sysdep/stub.h>
14		14
15	/*	15	/*
16	* This is in a separate file because it needs to be compiled with any	16	* This is in a separate file because it needs to be compiled with any


diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index 0a49ef0c2bf4..ff03067a3b14 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c
@@ -3,14 +3,14 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/mm.h"	6	#include <linux/mm.h>
7	#include "linux/sched.h"	7	#include <linux/sched.h>
8	#include "linux/slab.h"	8	#include <linux/slab.h>
9	#include "asm/pgalloc.h"	9	#include <asm/pgalloc.h>
10	#include "asm/pgtable.h"	10	#include <asm/pgtable.h>
11	#include "as-layout.h"	11	#include <as-layout.h>
12	#include "os.h"	12	#include <os.h>
13	#include "skas.h"	13	#include <skas.h>
14		14
15	extern int __syscall_stub_start;	15	extern int __syscall_stub_start;
16		16


diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index 0a9e57e7446b..4da11b3c8ddb 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c
@@ -3,12 +3,12 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/init.h"	6	#include <linux/init.h>
7	#include "linux/sched.h"	7	#include <linux/sched.h>
8	#include "as-layout.h"	8	#include <as-layout.h>
9	#include "kern.h"	9	#include <kern.h>
10	#include "os.h"	10	#include <os.h>
11	#include "skas.h"	11	#include <skas.h>
12		12
13	int new_mm(unsigned long stack)	13	int new_mm(unsigned long stack)
14	{	14	{


diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c index 86368a025a96..c0681e097432 100644 --- a/arch/um/kernel/skas/syscall.c +++ b/arch/um/kernel/skas/syscall.c
@@ -3,11 +3,11 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/kernel.h"	6	#include <linux/kernel.h>
7	#include "linux/ptrace.h"	7	#include <linux/ptrace.h>
8	#include "kern_util.h"	8	#include <kern_util.h>
9	#include "sysdep/ptrace.h"	9	#include <sysdep/ptrace.h>
10	#include "sysdep/syscalls.h"	10	#include <sysdep/syscalls.h>
11		11
12	extern int syscall_table_size;	12	extern int syscall_table_size;
13	#define NR_SYSCALLS (syscall_table_size / sizeof(void *))	13	#define NR_SYSCALLS (syscall_table_size / sizeof(void *))


diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c index cd7df79c6a56..1d3e0c17340b 100644 --- a/arch/um/kernel/skas/uaccess.c +++ b/arch/um/kernel/skas/uaccess.c
@@ -11,8 +11,8 @@
11	#include <asm/current.h>	11	#include <asm/current.h>
12	#include <asm/page.h>	12	#include <asm/page.h>
13	#include <asm/pgtable.h>	13	#include <asm/pgtable.h>
14	#include "kern_util.h"	14	#include <kern_util.h>
15	#include "os.h"	15	#include <os.h>
16		16
17	pte_t virt_to_pte(struct mm_struct mm, unsigned long addr)	17	pte_t virt_to_pte(struct mm_struct mm, unsigned long addr)
18	{	18	{


diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index a02b7e9e6b94..5c8c3ea7db7b 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c
@@ -3,24 +3,24 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/percpu.h"	6	#include <linux/percpu.h>
7	#include "asm/pgalloc.h"	7	#include <asm/pgalloc.h>
8	#include "asm/tlb.h"	8	#include <asm/tlb.h>
9		9
10	#ifdef CONFIG_SMP	10	#ifdef CONFIG_SMP
11		11
12	#include "linux/sched.h"	12	#include <linux/sched.h>
13	#include "linux/module.h"	13	#include <linux/module.h>
14	#include "linux/threads.h"	14	#include <linux/threads.h>
15	#include "linux/interrupt.h"	15	#include <linux/interrupt.h>
16	#include "linux/err.h"	16	#include <linux/err.h>
17	#include "linux/hardirq.h"	17	#include <linux/hardirq.h>
18	#include "asm/smp.h"	18	#include <asm/smp.h>
19	#include "asm/processor.h"	19	#include <asm/processor.h>
20	#include "asm/spinlock.h"	20	#include <asm/spinlock.h>
21	#include "kern.h"	21	#include <kern.h>
22	#include "irq_user.h"	22	#include <irq_user.h>
23	#include "os.h"	23	#include <os.h>
24		24
25	/* Per CPU bogomips and other parameters	25	/* Per CPU bogomips and other parameters
26	* The only piece used here is the ipi pipe, which is set before SMP is	26	* The only piece used here is the ipi pipe, which is set before SMP is


diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c index a4c6d8eee74c..10808bda3671 100644 --- a/arch/um/kernel/syscall.c +++ b/arch/um/kernel/syscall.c
@@ -3,16 +3,16 @@
3	* Licensed under the GPL	3	* Licensed under the GPL
4	*/	4	*/
5		5
6	#include "linux/file.h"	6	#include <linux/file.h>
7	#include "linux/fs.h"	7	#include <linux/fs.h>
8	#include "linux/mm.h"	8	#include <linux/mm.h>
9	#include "linux/sched.h"	9	#include <linux/sched.h>
10	#include "linux/utsname.h"	10	#include <linux/utsname.h>
11	#include "linux/syscalls.h"	11	#include <linux/syscalls.h>
12	#include "asm/current.h"	12	#include <asm/current.h>
13	#include "asm/mman.h"	13	#include <asm/mman.h>
14	#include "asm/uaccess.h"	14	#include <asm/uaccess.h>
15	#include "asm/unistd.h"	15	#include <asm/unistd.h>
16	#include "internal.h"	16	#include "internal.h"
17		17
18	long sys_fork(void)	18	long sys_fork(void)


diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 5f76d4ba151c..117568d4f64a 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c
@@ -10,8 +10,8 @@
10	#include <linux/threads.h>	10	#include <linux/threads.h>
11	#include <asm/irq.h>	11	#include <asm/irq.h>
12	#include <asm/param.h>	12	#include <asm/param.h>
13	#include "kern_util.h"	13	#include <kern_util.h>
14	#include "os.h"	14	#include <os.h>
15		15
16	void timer_handler(int sig, struct siginfo unused_si, struct uml_pt_regs regs)	16	void timer_handler(int sig, struct siginfo unused_si, struct uml_pt_regs regs)
17	{	17	{


diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index f819af951c19..9472079471bb 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c
@@ -8,10 +8,10 @@
8	#include <linux/sched.h>	8	#include <linux/sched.h>
9	#include <asm/pgtable.h>	9	#include <asm/pgtable.h>
10	#include <asm/tlbflush.h>	10	#include <asm/tlbflush.h>
11	#include "as-layout.h"	11	#include <as-layout.h>
12	#include "mem_user.h"	12	#include <mem_user.h>
13	#include "os.h"	13	#include <os.h>
14	#include "skas.h"	14	#include <skas.h>
15		15
16	struct host_vm_change {	16	struct host_vm_change {
17	struct host_vm_op {	17	struct host_vm_op {


diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 0353b98ae35a..cf7585fbc9fa 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c
@@ -10,11 +10,11 @@
10	#include <asm/current.h>	10	#include <asm/current.h>
11	#include <asm/pgtable.h>	11	#include <asm/pgtable.h>
12	#include <asm/tlbflush.h>	12	#include <asm/tlbflush.h>
13	#include "arch.h"	13	#include <arch.h>
14	#include "as-layout.h"	14	#include <as-layout.h>
15	#include "kern_util.h"	15	#include <kern_util.h>
16	#include "os.h"	16	#include <os.h>
17	#include "skas.h"	17	#include <skas.h>
18		18
19	/*	19	/*
20	* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by	20	* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by


diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 4db8770906ca..87df5e3acc26 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c
@@ -14,13 +14,13 @@
14	#include <asm/pgtable.h>	14	#include <asm/pgtable.h>
15	#include <asm/processor.h>	15	#include <asm/processor.h>
16	#include <asm/setup.h>	16	#include <asm/setup.h>
17	#include "as-layout.h"	17	#include <as-layout.h>
18	#include "arch.h"	18	#include <arch.h>
19	#include "init.h"	19	#include <init.h>
20	#include "kern.h"	20	#include <kern.h>
21	#include "kern_util.h"	21	#include <kern_util.h>
22	#include "mem_user.h"	22	#include <mem_user.h>
23	#include "os.h"	23	#include <os.h>
24		24
25	#define DEFAULT_COMMAND_LINE "root=98:0"	25	#define DEFAULT_COMMAND_LINE "root=98:0"
26		26


diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c index 81e07e2be3ae..f6cc3bd61781 100644 --- a/arch/um/kernel/umid.c +++ b/arch/um/kernel/umid.c
@@ -4,9 +4,9 @@
4	*/	4	*/
5		5
6	#include <asm/errno.h>	6	#include <asm/errno.h>
7	#include "init.h"	7	#include <init.h>
8	#include "kern.h"	8	#include <kern.h>
9	#include "os.h"	9	#include <os.h>
10		10
11	/* Changed by set_umid_arg */	11	/* Changed by set_umid_arg */
12	static int umid_inited = 0;	12	static int umid_inited = 0;


diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index fbd99402d4d2..ff65fb4f1a95 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S
@@ -60,7 +60,7 @@ SECTIONS
60	PROVIDE_HIDDEN(__rela_iplt_end = .);	60	PROVIDE_HIDDEN(__rela_iplt_end = .);
61	}	61	}
62		62
63	#include "asm/common.lds.S"	63	#include <asm/common.lds.S>
64		64
65	init.data : { INIT_DATA }	65	init.data : { INIT_DATA }
66	.data :	66	.data :