diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2012-10-07 22:27:32 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2012-10-09 16:28:45 -0400 |
commit | 37185b33240870719b6b5913a46e6a441f1ae96f (patch) | |
tree | 60a0f5adbb3d6b879a504defeddb3ff1ecff77d7 /arch/um/include | |
parent | 382d95fdfa7ff5c54f6495c597c7cf6d124e404b (diff) |
um: get rid of pointless include "..." where include <...> will do
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/asm/dma.h | 2 | ||||
-rw-r--r-- | arch/um/include/asm/mmu.h | 2 | ||||
-rw-r--r-- | arch/um/include/asm/page.h | 2 | ||||
-rw-r--r-- | arch/um/include/asm/pgtable.h | 4 | ||||
-rw-r--r-- | arch/um/include/asm/processor-generic.h | 6 | ||||
-rw-r--r-- | arch/um/include/asm/ptrace-generic.h | 2 | ||||
-rw-r--r-- | arch/um/include/asm/smp.h | 6 | ||||
-rw-r--r-- | arch/um/include/shared/arch.h | 2 | ||||
-rw-r--r-- | arch/um/include/shared/as-layout.h | 2 | ||||
-rw-r--r-- | arch/um/include/shared/irq_kern.h | 4 | ||||
-rw-r--r-- | arch/um/include/shared/irq_user.h | 2 | ||||
-rw-r--r-- | arch/um/include/shared/kern_util.h | 4 | ||||
-rw-r--r-- | arch/um/include/shared/longjmp.h | 4 | ||||
-rw-r--r-- | arch/um/include/shared/os.h | 6 | ||||
-rw-r--r-- | arch/um/include/shared/registers.h | 4 | ||||
-rw-r--r-- | arch/um/include/shared/skas/skas.h | 2 | ||||
-rw-r--r-- | arch/um/include/shared/skas_ptrace.h | 2 |
17 files changed, 28 insertions, 28 deletions
diff --git a/arch/um/include/asm/dma.h b/arch/um/include/asm/dma.h index 9f6139a8a525..f88c5860520b 100644 --- a/arch/um/include/asm/dma.h +++ b/arch/um/include/asm/dma.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __UM_DMA_H | 1 | #ifndef __UM_DMA_H |
2 | #define __UM_DMA_H | 2 | #define __UM_DMA_H |
3 | 3 | ||
4 | #include "asm/io.h" | 4 | #include <asm/io.h> |
5 | 5 | ||
6 | extern unsigned long uml_physmem; | 6 | extern unsigned long uml_physmem; |
7 | 7 | ||
diff --git a/arch/um/include/asm/mmu.h b/arch/um/include/asm/mmu.h index 53e8b498ebba..da705448590f 100644 --- a/arch/um/include/asm/mmu.h +++ b/arch/um/include/asm/mmu.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #ifndef __ARCH_UM_MMU_H | 6 | #ifndef __ARCH_UM_MMU_H |
7 | #define __ARCH_UM_MMU_H | 7 | #define __ARCH_UM_MMU_H |
8 | 8 | ||
9 | #include "mm_id.h" | 9 | #include <mm_id.h> |
10 | #include <asm/mm_context.h> | 10 | #include <asm/mm_context.h> |
11 | 11 | ||
12 | typedef struct mm_context { | 12 | typedef struct mm_context { |
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h index 7cfc3cedce84..5ff53d9185f7 100644 --- a/arch/um/include/asm/page.h +++ b/arch/um/include/asm/page.h | |||
@@ -99,7 +99,7 @@ extern unsigned long uml_physmem; | |||
99 | 99 | ||
100 | #define __va_space (8*1024*1024) | 100 | #define __va_space (8*1024*1024) |
101 | 101 | ||
102 | #include "mem.h" | 102 | #include <mem.h> |
103 | 103 | ||
104 | /* Cast to unsigned long before casting to void * to avoid a warning from | 104 | /* Cast to unsigned long before casting to void * to avoid a warning from |
105 | * mmap_kmem about cutting a long long down to a void *. Not sure that | 105 | * mmap_kmem about cutting a long long down to a void *. Not sure that |
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index 5888f1b83477..ae02909a1875 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h | |||
@@ -23,9 +23,9 @@ | |||
23 | pte_present gives true */ | 23 | pte_present gives true */ |
24 | 24 | ||
25 | #ifdef CONFIG_3_LEVEL_PGTABLES | 25 | #ifdef CONFIG_3_LEVEL_PGTABLES |
26 | #include "asm/pgtable-3level.h" | 26 | #include <asm/pgtable-3level.h> |
27 | #else | 27 | #else |
28 | #include "asm/pgtable-2level.h" | 28 | #include <asm/pgtable-2level.h> |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 31 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h index 33a6a2423bd2..24e97be814bc 100644 --- a/arch/um/include/asm/processor-generic.h +++ b/arch/um/include/asm/processor-generic.h | |||
@@ -10,9 +10,9 @@ struct pt_regs; | |||
10 | 10 | ||
11 | struct task_struct; | 11 | struct task_struct; |
12 | 12 | ||
13 | #include "asm/ptrace.h" | 13 | #include <asm/ptrace.h> |
14 | #include "registers.h" | 14 | #include <registers.h> |
15 | #include "sysdep/archsetjmp.h" | 15 | #include <sysdep/archsetjmp.h> |
16 | 16 | ||
17 | #include <linux/prefetch.h> | 17 | #include <linux/prefetch.h> |
18 | 18 | ||
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 442f1d025dc2..cb9b3c47ca8e 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
10 | 10 | ||
11 | #include <asm/ptrace-abi.h> | 11 | #include <asm/ptrace-abi.h> |
12 | #include "sysdep/ptrace.h" | 12 | #include <sysdep/ptrace.h> |
13 | 13 | ||
14 | struct pt_regs { | 14 | struct pt_regs { |
15 | struct uml_pt_regs regs; | 15 | struct uml_pt_regs regs; |
diff --git a/arch/um/include/asm/smp.h b/arch/um/include/asm/smp.h index 4a4b09d4f366..e4507938d8cf 100644 --- a/arch/um/include/asm/smp.h +++ b/arch/um/include/asm/smp.h | |||
@@ -3,9 +3,9 @@ | |||
3 | 3 | ||
4 | #ifdef CONFIG_SMP | 4 | #ifdef CONFIG_SMP |
5 | 5 | ||
6 | #include "linux/bitops.h" | 6 | #include <linux/bitops.h> |
7 | #include "asm/current.h" | 7 | #include <asm/current.h> |
8 | #include "linux/cpumask.h" | 8 | #include <linux/cpumask.h> |
9 | 9 | ||
10 | #define raw_smp_processor_id() (current_thread->cpu) | 10 | #define raw_smp_processor_id() (current_thread->cpu) |
11 | 11 | ||
diff --git a/arch/um/include/shared/arch.h b/arch/um/include/shared/arch.h index 2de92a08a76b..4f46abda060d 100644 --- a/arch/um/include/shared/arch.h +++ b/arch/um/include/shared/arch.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #ifndef __ARCH_H__ | 6 | #ifndef __ARCH_H__ |
7 | #define __ARCH_H__ | 7 | #define __ARCH_H__ |
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | 10 | ||
11 | extern void arch_check_bugs(void); | 11 | extern void arch_check_bugs(void); |
12 | extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs); | 12 | extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs); |
diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h index 86daa5461815..694c792bab4e 100644 --- a/arch/um/include/shared/as-layout.h +++ b/arch/um/include/shared/as-layout.h | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #ifndef __ASSEMBLY__ | 36 | #ifndef __ASSEMBLY__ |
37 | 37 | ||
38 | #include "sysdep/ptrace.h" | 38 | #include <sysdep/ptrace.h> |
39 | 39 | ||
40 | struct cpu_task { | 40 | struct cpu_task { |
41 | int pid; | 41 | int pid; |
diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h index 7a5bfa6291b8..e05bd667de15 100644 --- a/arch/um/include/shared/irq_kern.h +++ b/arch/um/include/shared/irq_kern.h | |||
@@ -6,8 +6,8 @@ | |||
6 | #ifndef __IRQ_KERN_H__ | 6 | #ifndef __IRQ_KERN_H__ |
7 | #define __IRQ_KERN_H__ | 7 | #define __IRQ_KERN_H__ |
8 | 8 | ||
9 | #include "linux/interrupt.h" | 9 | #include <linux/interrupt.h> |
10 | #include "asm/ptrace.h" | 10 | #include <asm/ptrace.h> |
11 | 11 | ||
12 | extern int um_request_irq(unsigned int irq, int fd, int type, | 12 | extern int um_request_irq(unsigned int irq, int fd, int type, |
13 | irq_handler_t handler, | 13 | irq_handler_t handler, |
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h index 2b6d703925b5..df5633053957 100644 --- a/arch/um/include/shared/irq_user.h +++ b/arch/um/include/shared/irq_user.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #ifndef __IRQ_USER_H__ | 6 | #ifndef __IRQ_USER_H__ |
7 | #define __IRQ_USER_H__ | 7 | #define __IRQ_USER_H__ |
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | 10 | ||
11 | struct irq_fd { | 11 | struct irq_fd { |
12 | struct irq_fd *next; | 12 | struct irq_fd *next; |
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index af6b6dc868ba..83a91f976330 100644 --- a/arch/um/include/shared/kern_util.h +++ b/arch/um/include/shared/kern_util.h | |||
@@ -6,8 +6,8 @@ | |||
6 | #ifndef __KERN_UTIL_H__ | 6 | #ifndef __KERN_UTIL_H__ |
7 | #define __KERN_UTIL_H__ | 7 | #define __KERN_UTIL_H__ |
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | #include "sysdep/faultinfo.h" | 10 | #include <sysdep/faultinfo.h> |
11 | 11 | ||
12 | struct siginfo; | 12 | struct siginfo; |
13 | 13 | ||
diff --git a/arch/um/include/shared/longjmp.h b/arch/um/include/shared/longjmp.h index e860bc5848e0..9bdddf4c405b 100644 --- a/arch/um/include/shared/longjmp.h +++ b/arch/um/include/shared/longjmp.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef __UML_LONGJMP_H | 1 | #ifndef __UML_LONGJMP_H |
2 | #define __UML_LONGJMP_H | 2 | #define __UML_LONGJMP_H |
3 | 3 | ||
4 | #include "sysdep/archsetjmp.h" | 4 | #include <sysdep/archsetjmp.h> |
5 | #include "os.h" | 5 | #include <os.h> |
6 | 6 | ||
7 | extern int setjmp(jmp_buf); | 7 | extern int setjmp(jmp_buf); |
8 | extern void longjmp(jmp_buf, int); | 8 | extern void longjmp(jmp_buf, int); |
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index 89b686c1a3ea..44883049c11d 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h | |||
@@ -7,9 +7,9 @@ | |||
7 | #define __OS_H__ | 7 | #define __OS_H__ |
8 | 8 | ||
9 | #include <stdarg.h> | 9 | #include <stdarg.h> |
10 | #include "irq_user.h" | 10 | #include <irq_user.h> |
11 | #include "longjmp.h" | 11 | #include <longjmp.h> |
12 | #include "mm_id.h" | 12 | #include <mm_id.h> |
13 | 13 | ||
14 | #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) | 14 | #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) |
15 | 15 | ||
diff --git a/arch/um/include/shared/registers.h b/arch/um/include/shared/registers.h index f1e0aa56c52a..f5b76355ad71 100644 --- a/arch/um/include/shared/registers.h +++ b/arch/um/include/shared/registers.h | |||
@@ -6,8 +6,8 @@ | |||
6 | #ifndef __REGISTERS_H | 6 | #ifndef __REGISTERS_H |
7 | #define __REGISTERS_H | 7 | #define __REGISTERS_H |
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | #include "sysdep/archsetjmp.h" | 10 | #include <sysdep/archsetjmp.h> |
11 | 11 | ||
12 | extern int save_fp_registers(int pid, unsigned long *fp_regs); | 12 | extern int save_fp_registers(int pid, unsigned long *fp_regs); |
13 | extern int restore_fp_registers(int pid, unsigned long *fp_regs); | 13 | extern int restore_fp_registers(int pid, unsigned long *fp_regs); |
diff --git a/arch/um/include/shared/skas/skas.h b/arch/um/include/shared/skas/skas.h index 64d2c7443306..c45df961c874 100644 --- a/arch/um/include/shared/skas/skas.h +++ b/arch/um/include/shared/skas/skas.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #ifndef __SKAS_H | 6 | #ifndef __SKAS_H |
7 | #define __SKAS_H | 7 | #define __SKAS_H |
8 | 8 | ||
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | 10 | ||
11 | extern int userspace_pid[]; | 11 | extern int userspace_pid[]; |
12 | extern int proc_mm, ptrace_faultinfo, ptrace_ldt; | 12 | extern int proc_mm, ptrace_faultinfo, ptrace_ldt; |
diff --git a/arch/um/include/shared/skas_ptrace.h b/arch/um/include/shared/skas_ptrace.h index 3d31bbacd016..630a9c92b93c 100644 --- a/arch/um/include/shared/skas_ptrace.h +++ b/arch/um/include/shared/skas_ptrace.h | |||
@@ -9,6 +9,6 @@ | |||
9 | #define PTRACE_FAULTINFO 52 | 9 | #define PTRACE_FAULTINFO 52 |
10 | #define PTRACE_SWITCH_MM 55 | 10 | #define PTRACE_SWITCH_MM 55 |
11 | 11 | ||
12 | #include "sysdep/skas_ptrace.h" | 12 | #include <sysdep/skas_ptrace.h> |
13 | 13 | ||
14 | #endif | 14 | #endif |