diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2014-09-27 03:19:11 -0400 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2014-10-13 05:16:20 -0400 |
| commit | be64c997d96dd29029ed40d9df9cbf80fa1c7ed4 (patch) | |
| tree | e5ff25a196392244fcfa229e51c76d4d824e9975 /arch/arc/include | |
| parent | ebc0c74e76cec9c4dd860eb0ca1c0b39dc63c482 (diff) | |
ARC: remove extraneous __KERNEL__ guards
Verified by doing make headers_install as none of these files are
exported to userspace
Diffstat (limited to 'arch/arc/include')
| -rw-r--r-- | arch/arc/include/asm/arcregs.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/atomic.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/bitops.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/current.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/irqflags.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/processor.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/string.h | 3 | ||||
| -rw-r--r-- | arch/arc/include/asm/syscalls.h | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/thread_info.h | 4 |
9 files changed, 0 insertions, 35 deletions
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index 372466b371bf..d6d82577cabe 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #ifndef _ASM_ARC_ARCREGS_H | 9 | #ifndef _ASM_ARC_ARCREGS_H |
| 10 | #define _ASM_ARC_ARCREGS_H | 10 | #define _ASM_ARC_ARCREGS_H |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | |||
| 14 | /* Build Configuration Registers */ | 12 | /* Build Configuration Registers */ |
| 15 | #define ARC_REG_DCCMBASE_BCR 0x61 /* DCCM Base Addr */ | 13 | #define ARC_REG_DCCMBASE_BCR 0x61 /* DCCM Base Addr */ |
| 16 | #define ARC_REG_CRC_BCR 0x62 | 14 | #define ARC_REG_CRC_BCR 0x62 |
| @@ -321,6 +319,4 @@ extern struct cpuinfo_arc cpuinfo_arc700[]; | |||
| 321 | 319 | ||
| 322 | #endif /* __ASEMBLY__ */ | 320 | #endif /* __ASEMBLY__ */ |
| 323 | 321 | ||
| 324 | #endif /* __KERNEL__ */ | ||
| 325 | |||
| 326 | #endif /* _ASM_ARC_ARCREGS_H */ | 322 | #endif /* _ASM_ARC_ARCREGS_H */ |
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h index 83f03ca6caf6..6638a0392f4e 100644 --- a/arch/arc/include/asm/atomic.h +++ b/arch/arc/include/asm/atomic.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #ifndef _ASM_ARC_ATOMIC_H | 9 | #ifndef _ASM_ARC_ATOMIC_H |
| 10 | #define _ASM_ARC_ATOMIC_H | 10 | #define _ASM_ARC_ATOMIC_H |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | |||
| 14 | #ifndef __ASSEMBLY__ | 12 | #ifndef __ASSEMBLY__ |
| 15 | 13 | ||
| 16 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| @@ -228,5 +226,3 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
| 228 | #endif | 226 | #endif |
| 229 | 227 | ||
| 230 | #endif | 228 | #endif |
| 231 | |||
| 232 | #endif | ||
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index ebc0cf3164dc..1a5bf07eefe2 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h | |||
| @@ -13,8 +13,6 @@ | |||
| 13 | #error only <linux/bitops.h> can be included directly | 13 | #error only <linux/bitops.h> can be included directly |
| 14 | #endif | 14 | #endif |
| 15 | 15 | ||
| 16 | #ifdef __KERNEL__ | ||
| 17 | |||
| 18 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 19 | 17 | ||
| 20 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| @@ -508,6 +506,4 @@ static inline __attribute__ ((const)) int __ffs(unsigned long word) | |||
| 508 | 506 | ||
| 509 | #endif /* !__ASSEMBLY__ */ | 507 | #endif /* !__ASSEMBLY__ */ |
| 510 | 508 | ||
| 511 | #endif /* __KERNEL__ */ | ||
| 512 | |||
| 513 | #endif | 509 | #endif |
diff --git a/arch/arc/include/asm/current.h b/arch/arc/include/asm/current.h index 87b918585c4a..c2453ee62801 100644 --- a/arch/arc/include/asm/current.h +++ b/arch/arc/include/asm/current.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #ifndef _ASM_ARC_CURRENT_H | 12 | #ifndef _ASM_ARC_CURRENT_H |
| 13 | #define _ASM_ARC_CURRENT_H | 13 | #define _ASM_ARC_CURRENT_H |
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | ||
| 16 | |||
| 17 | #ifndef __ASSEMBLY__ | 15 | #ifndef __ASSEMBLY__ |
| 18 | 16 | ||
| 19 | #ifdef CONFIG_ARC_CURR_IN_REG | 17 | #ifdef CONFIG_ARC_CURR_IN_REG |
| @@ -27,6 +25,4 @@ register struct task_struct *curr_arc asm("r25"); | |||
| 27 | 25 | ||
| 28 | #endif /* ! __ASSEMBLY__ */ | 26 | #endif /* ! __ASSEMBLY__ */ |
| 29 | 27 | ||
| 30 | #endif /* __KERNEL__ */ | ||
| 31 | |||
| 32 | #endif /* _ASM_ARC_CURRENT_H */ | 28 | #endif /* _ASM_ARC_CURRENT_H */ |
diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h index 587df8236e8b..742816f1b210 100644 --- a/arch/arc/include/asm/irqflags.h +++ b/arch/arc/include/asm/irqflags.h | |||
| @@ -15,8 +15,6 @@ | |||
| 15 | * -Conditionally disable interrupts (if they are not enabled, don't disable) | 15 | * -Conditionally disable interrupts (if they are not enabled, don't disable) |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifdef __KERNEL__ | ||
| 19 | |||
| 20 | #include <asm/arcregs.h> | 18 | #include <asm/arcregs.h> |
| 21 | 19 | ||
| 22 | /* status32 Reg bits related to Interrupt Handling */ | 20 | /* status32 Reg bits related to Interrupt Handling */ |
| @@ -169,6 +167,4 @@ static inline int arch_irqs_disabled(void) | |||
| 169 | 167 | ||
| 170 | #endif /* __ASSEMBLY__ */ | 168 | #endif /* __ASSEMBLY__ */ |
| 171 | 169 | ||
| 172 | #endif /* KERNEL */ | ||
| 173 | |||
| 174 | #endif | 170 | #endif |
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 82588f3ba77f..08fbe2e9d4cc 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #ifndef __ASM_ARC_PROCESSOR_H | 14 | #ifndef __ASM_ARC_PROCESSOR_H |
| 15 | #define __ASM_ARC_PROCESSOR_H | 15 | #define __ASM_ARC_PROCESSOR_H |
| 16 | 16 | ||
| 17 | #ifdef __KERNEL__ | ||
| 18 | |||
| 19 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
| 20 | 18 | ||
| 21 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
| @@ -128,6 +126,4 @@ extern unsigned int get_wchan(struct task_struct *p); | |||
| 128 | */ | 126 | */ |
| 129 | #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) | 127 | #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) |
| 130 | 128 | ||
| 131 | #endif /* __KERNEL__ */ | ||
| 132 | |||
| 133 | #endif /* __ASM_ARC_PROCESSOR_H */ | 129 | #endif /* __ASM_ARC_PROCESSOR_H */ |
diff --git a/arch/arc/include/asm/string.h b/arch/arc/include/asm/string.h index 87676c8f1412..95822b550a18 100644 --- a/arch/arc/include/asm/string.h +++ b/arch/arc/include/asm/string.h | |||
| @@ -17,8 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | 19 | ||
| 20 | #ifdef __KERNEL__ | ||
| 21 | |||
| 22 | #define __HAVE_ARCH_MEMSET | 20 | #define __HAVE_ARCH_MEMSET |
| 23 | #define __HAVE_ARCH_MEMCPY | 21 | #define __HAVE_ARCH_MEMCPY |
| 24 | #define __HAVE_ARCH_MEMCMP | 22 | #define __HAVE_ARCH_MEMCMP |
| @@ -36,5 +34,4 @@ extern char *strcpy(char *dest, const char *src); | |||
| 36 | extern int strcmp(const char *cs, const char *ct); | 34 | extern int strcmp(const char *cs, const char *ct); |
| 37 | extern __kernel_size_t strlen(const char *); | 35 | extern __kernel_size_t strlen(const char *); |
| 38 | 36 | ||
| 39 | #endif /* __KERNEL__ */ | ||
| 40 | #endif /* _ASM_ARC_STRING_H */ | 37 | #endif /* _ASM_ARC_STRING_H */ |
diff --git a/arch/arc/include/asm/syscalls.h b/arch/arc/include/asm/syscalls.h index dd785befe7fd..e56f9fcc5581 100644 --- a/arch/arc/include/asm/syscalls.h +++ b/arch/arc/include/asm/syscalls.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #ifndef _ASM_ARC_SYSCALLS_H | 9 | #ifndef _ASM_ARC_SYSCALLS_H |
| 10 | #define _ASM_ARC_SYSCALLS_H 1 | 10 | #define _ASM_ARC_SYSCALLS_H 1 |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | |||
| 14 | #include <linux/compiler.h> | 12 | #include <linux/compiler.h> |
| 15 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 16 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| @@ -22,6 +20,4 @@ int sys_arc_gettls(void); | |||
| 22 | 20 | ||
| 23 | #include <asm-generic/syscalls.h> | 21 | #include <asm-generic/syscalls.h> |
| 24 | 22 | ||
| 25 | #endif /* __KERNEL__ */ | ||
| 26 | |||
| 27 | #endif | 23 | #endif |
diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h index 45be21672011..02bc5ec0fb2e 100644 --- a/arch/arc/include/asm/thread_info.h +++ b/arch/arc/include/asm/thread_info.h | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | #ifndef _ASM_THREAD_INFO_H | 16 | #ifndef _ASM_THREAD_INFO_H |
| 17 | #define _ASM_THREAD_INFO_H | 17 | #define _ASM_THREAD_INFO_H |
| 18 | 18 | ||
| 19 | #ifdef __KERNEL__ | ||
| 20 | |||
| 21 | #include <asm/page.h> | 19 | #include <asm/page.h> |
| 22 | 20 | ||
| 23 | #ifdef CONFIG_16KSTACKS | 21 | #ifdef CONFIG_16KSTACKS |
| @@ -114,6 +112,4 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void) | |||
| 114 | * syscall, so all that reamins to be tested is _TIF_WORK_MASK | 112 | * syscall, so all that reamins to be tested is _TIF_WORK_MASK |
| 115 | */ | 113 | */ |
| 116 | 114 | ||
| 117 | #endif /* __KERNEL__ */ | ||
| 118 | |||
| 119 | #endif /* _ASM_THREAD_INFO_H */ | 115 | #endif /* _ASM_THREAD_INFO_H */ |
