diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
| commit | a1ce39288e6fbefdd8d607021d02384eb4a20b99 (patch) | |
| tree | c72e67f0c9d828420788f9086a19df1b9a7e39ae /arch/sh/include/asm | |
| parent | 760285e7e7ab282c25b5e90816f7c47000557f4f (diff) | |
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
Convert #include "..." to #include <path/...> in kernel system headers.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/bl_bit.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/cache_insns.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/checksum.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/mmu_context.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/posix_types.h | 8 | ||||
| -rw-r--r-- | arch/sh/include/asm/processor.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/ptrace.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/string.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/switch_to.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/syscall.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/syscalls.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/tlb.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/traps.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/uaccess.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/unistd.h | 8 |
15 files changed, 32 insertions, 32 deletions
diff --git a/arch/sh/include/asm/bl_bit.h b/arch/sh/include/asm/bl_bit.h index 45e6b9fc37a..06e4163c674 100644 --- a/arch/sh/include/asm/bl_bit.h +++ b/arch/sh/include/asm/bl_bit.h | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | #define __ASM_SH_BL_BIT_H | 2 | #define __ASM_SH_BL_BIT_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_SUPERH32 | 4 | #ifdef CONFIG_SUPERH32 |
| 5 | # include "bl_bit_32.h" | 5 | # include <asm/bl_bit_32.h> |
| 6 | #else | 6 | #else |
| 7 | # include "bl_bit_64.h" | 7 | # include <asm/bl_bit_64.h> |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | #endif /* __ASM_SH_BL_BIT_H */ | 10 | #endif /* __ASM_SH_BL_BIT_H */ |
diff --git a/arch/sh/include/asm/cache_insns.h b/arch/sh/include/asm/cache_insns.h index d25fbe53090..355cb06b7a3 100644 --- a/arch/sh/include/asm/cache_insns.h +++ b/arch/sh/include/asm/cache_insns.h | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #ifdef CONFIG_SUPERH32 | 5 | #ifdef CONFIG_SUPERH32 |
| 6 | # include "cache_insns_32.h" | 6 | # include <asm/cache_insns_32.h> |
| 7 | #else | 7 | #else |
| 8 | # include "cache_insns_64.h" | 8 | # include <asm/cache_insns_64.h> |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #endif /* __ASM_SH_CACHE_INSNS_H */ | 11 | #endif /* __ASM_SH_CACHE_INSNS_H */ |
diff --git a/arch/sh/include/asm/checksum.h b/arch/sh/include/asm/checksum.h index fc26d1f4b59..34ae2620452 100644 --- a/arch/sh/include/asm/checksum.h +++ b/arch/sh/include/asm/checksum.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifdef CONFIG_SUPERH32 | 1 | #ifdef CONFIG_SUPERH32 |
| 2 | # include "checksum_32.h" | 2 | # include <asm/checksum_32.h> |
| 3 | #else | 3 | #else |
| 4 | # include <asm-generic/checksum.h> | 4 | # include <asm-generic/checksum.h> |
| 5 | #endif | 5 | #endif |
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 384c7471a37..21c5088788d 100644 --- a/arch/sh/include/asm/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h | |||
| @@ -46,9 +46,9 @@ | |||
| 46 | #define MMU_VPN_MASK 0xfffff000 | 46 | #define MMU_VPN_MASK 0xfffff000 |
| 47 | 47 | ||
| 48 | #if defined(CONFIG_SUPERH32) | 48 | #if defined(CONFIG_SUPERH32) |
| 49 | #include "mmu_context_32.h" | 49 | #include <asm/mmu_context_32.h> |
| 50 | #else | 50 | #else |
| 51 | #include "mmu_context_64.h" | 51 | #include <asm/mmu_context_64.h> |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | /* | 54 | /* |
diff --git a/arch/sh/include/asm/posix_types.h b/arch/sh/include/asm/posix_types.h index 4eeb723aee7..f08449bcbde 100644 --- a/arch/sh/include/asm/posix_types.h +++ b/arch/sh/include/asm/posix_types.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifdef __KERNEL__ |
| 2 | # ifdef CONFIG_SUPERH32 | 2 | # ifdef CONFIG_SUPERH32 |
| 3 | # include "posix_types_32.h" | 3 | # include <asm/posix_types_32.h> |
| 4 | # else | 4 | # else |
| 5 | # include "posix_types_64.h" | 5 | # include <asm/posix_types_64.h> |
| 6 | # endif | 6 | # endif |
| 7 | #else | 7 | #else |
| 8 | # ifdef __SH5__ | 8 | # ifdef __SH5__ |
| 9 | # include "posix_types_64.h" | 9 | # include <asm/posix_types_64.h> |
| 10 | # else | 10 | # else |
| 11 | # include "posix_types_32.h" | 11 | # include <asm/posix_types_32.h> |
| 12 | # endif | 12 | # endif |
| 13 | #endif /* __KERNEL__ */ | 13 | #endif /* __KERNEL__ */ |
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index 3d14aeaef57..5448f9bbf4a 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h | |||
| @@ -175,9 +175,9 @@ extern unsigned int instruction_size(unsigned int insn); | |||
| 175 | #endif /* __ASSEMBLY__ */ | 175 | #endif /* __ASSEMBLY__ */ |
| 176 | 176 | ||
| 177 | #ifdef CONFIG_SUPERH32 | 177 | #ifdef CONFIG_SUPERH32 |
| 178 | # include "processor_32.h" | 178 | # include <asm/processor_32.h> |
| 179 | #else | 179 | #else |
| 180 | # include "processor_64.h" | 180 | # include <asm/processor_64.h> |
| 181 | #endif | 181 | #endif |
| 182 | 182 | ||
| 183 | #endif /* __ASM_SH_PROCESSOR_H */ | 183 | #endif /* __ASM_SH_PROCESSOR_H */ |
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index c7b7e1ed194..a4a38dff997 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h | |||
| @@ -25,9 +25,9 @@ | |||
| 25 | #define PT_TEXT_LEN 252 | 25 | #define PT_TEXT_LEN 252 |
| 26 | 26 | ||
| 27 | #if defined(__SH5__) || defined(CONFIG_CPU_SH5) | 27 | #if defined(__SH5__) || defined(CONFIG_CPU_SH5) |
| 28 | #include "ptrace_64.h" | 28 | #include <asm/ptrace_64.h> |
| 29 | #else | 29 | #else |
| 30 | #include "ptrace_32.h" | 30 | #include <asm/ptrace_32.h> |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | #ifdef __KERNEL__ | 33 | #ifdef __KERNEL__ |
diff --git a/arch/sh/include/asm/string.h b/arch/sh/include/asm/string.h index 8c1ea21dc0a..114011fa08a 100644 --- a/arch/sh/include/asm/string.h +++ b/arch/sh/include/asm/string.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifdef CONFIG_SUPERH32 | 1 | #ifdef CONFIG_SUPERH32 |
| 2 | # include "string_32.h" | 2 | # include <asm/string_32.h> |
| 3 | #else | 3 | #else |
| 4 | # include "string_64.h" | 4 | # include <asm/string_64.h> |
| 5 | #endif | 5 | #endif |
diff --git a/arch/sh/include/asm/switch_to.h b/arch/sh/include/asm/switch_to.h index 62b1941813e..bcd722fc834 100644 --- a/arch/sh/include/asm/switch_to.h +++ b/arch/sh/include/asm/switch_to.h | |||
| @@ -11,9 +11,9 @@ | |||
| 11 | #define __ASM_SH_SWITCH_TO_H | 11 | #define __ASM_SH_SWITCH_TO_H |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_SUPERH32 | 13 | #ifdef CONFIG_SUPERH32 |
| 14 | # include "switch_to_32.h" | 14 | # include <asm/switch_to_32.h> |
| 15 | #else | 15 | #else |
| 16 | # include "switch_to_64.h" | 16 | # include <asm/switch_to_64.h> |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | #endif /* __ASM_SH_SWITCH_TO_H */ | 19 | #endif /* __ASM_SH_SWITCH_TO_H */ |
diff --git a/arch/sh/include/asm/syscall.h b/arch/sh/include/asm/syscall.h index aa7777bdc37..847128da6ea 100644 --- a/arch/sh/include/asm/syscall.h +++ b/arch/sh/include/asm/syscall.h | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | extern const unsigned long sys_call_table[]; | 4 | extern const unsigned long sys_call_table[]; |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_SUPERH32 | 6 | #ifdef CONFIG_SUPERH32 |
| 7 | # include "syscall_32.h" | 7 | # include <asm/syscall_32.h> |
| 8 | #else | 8 | #else |
| 9 | # include "syscall_64.h" | 9 | # include <asm/syscall_64.h> |
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | #endif /* __ASM_SH_SYSCALL_H */ | 12 | #endif /* __ASM_SH_SYSCALL_H */ |
diff --git a/arch/sh/include/asm/syscalls.h b/arch/sh/include/asm/syscalls.h index 507725af2e5..3dbfef06f6b 100644 --- a/arch/sh/include/asm/syscalls.h +++ b/arch/sh/include/asm/syscalls.h | |||
| @@ -11,9 +11,9 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
| 11 | unsigned long fd, unsigned long pgoff); | 11 | unsigned long fd, unsigned long pgoff); |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_SUPERH32 | 13 | #ifdef CONFIG_SUPERH32 |
| 14 | # include "syscalls_32.h" | 14 | # include <asm/syscalls_32.h> |
| 15 | #else | 15 | #else |
| 16 | # include "syscalls_64.h" | 16 | # include <asm/syscalls_64.h> |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | #endif /* __KERNEL__ */ | 19 | #endif /* __KERNEL__ */ |
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h index ec88bfcdf7c..e61d43d9f68 100644 --- a/arch/sh/include/asm/tlb.h +++ b/arch/sh/include/asm/tlb.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __ASM_SH_TLB_H | 2 | #define __ASM_SH_TLB_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_SUPERH64 | 4 | #ifdef CONFIG_SUPERH64 |
| 5 | # include "tlb_64.h" | 5 | # include <asm/tlb_64.h> |
| 6 | #endif | 6 | #endif |
| 7 | 7 | ||
| 8 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
diff --git a/arch/sh/include/asm/traps.h b/arch/sh/include/asm/traps.h index afd9df8d064..9cc149a0dbd 100644 --- a/arch/sh/include/asm/traps.h +++ b/arch/sh/include/asm/traps.h | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_SUPERH32 | 6 | #ifdef CONFIG_SUPERH32 |
| 7 | # include "traps_32.h" | 7 | # include <asm/traps_32.h> |
| 8 | #else | 8 | #else |
| 9 | # include "traps_64.h" | 9 | # include <asm/traps_64.h> |
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | BUILD_TRAP_HANDLER(address_error); | 12 | BUILD_TRAP_HANDLER(address_error); |
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index 8698a80ed00..9486376605f 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h | |||
| @@ -97,9 +97,9 @@ struct __large_struct { unsigned long buf[100]; }; | |||
| 97 | }) | 97 | }) |
| 98 | 98 | ||
| 99 | #ifdef CONFIG_SUPERH32 | 99 | #ifdef CONFIG_SUPERH32 |
| 100 | # include "uaccess_32.h" | 100 | # include <asm/uaccess_32.h> |
| 101 | #else | 101 | #else |
| 102 | # include "uaccess_64.h" | 102 | # include <asm/uaccess_64.h> |
| 103 | #endif | 103 | #endif |
| 104 | 104 | ||
| 105 | extern long strncpy_from_user(char *dest, const char __user *src, long count); | 105 | extern long strncpy_from_user(char *dest, const char __user *src, long count); |
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index 7bc67076baa..307201a854f 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifdef __KERNEL__ |
| 2 | # ifdef CONFIG_SUPERH32 | 2 | # ifdef CONFIG_SUPERH32 |
| 3 | # include "unistd_32.h" | 3 | # include <asm/unistd_32.h> |
| 4 | # else | 4 | # else |
| 5 | # include "unistd_64.h" | 5 | # include <asm/unistd_64.h> |
| 6 | # endif | 6 | # endif |
| 7 | 7 | ||
| 8 | # define __ARCH_WANT_SYS_RT_SIGSUSPEND | 8 | # define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| @@ -40,8 +40,8 @@ | |||
| 40 | 40 | ||
| 41 | #else | 41 | #else |
| 42 | # ifdef __SH5__ | 42 | # ifdef __SH5__ |
| 43 | # include "unistd_64.h" | 43 | # include <asm/unistd_64.h> |
| 44 | # else | 44 | # else |
| 45 | # include "unistd_32.h" | 45 | # include <asm/unistd_32.h> |
| 46 | # endif | 46 | # endif |
| 47 | #endif | 47 | #endif |
