提交 be64c997 编写于 作者: V Vineet Gupta

ARC: remove extraneous __KERNEL__ guards

Verified by doing make headers_install as none of these files are
exported to userspace
上级 ebc0c74e
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#ifndef _ASM_ARC_ARCREGS_H #ifndef _ASM_ARC_ARCREGS_H
#define _ASM_ARC_ARCREGS_H #define _ASM_ARC_ARCREGS_H
#ifdef __KERNEL__
/* Build Configuration Registers */ /* Build Configuration Registers */
#define ARC_REG_DCCMBASE_BCR 0x61 /* DCCM Base Addr */ #define ARC_REG_DCCMBASE_BCR 0x61 /* DCCM Base Addr */
#define ARC_REG_CRC_BCR 0x62 #define ARC_REG_CRC_BCR 0x62
...@@ -321,6 +319,4 @@ extern struct cpuinfo_arc cpuinfo_arc700[]; ...@@ -321,6 +319,4 @@ extern struct cpuinfo_arc cpuinfo_arc700[];
#endif /* __ASEMBLY__ */ #endif /* __ASEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_ARC_ARCREGS_H */ #endif /* _ASM_ARC_ARCREGS_H */
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#ifndef _ASM_ARC_ATOMIC_H #ifndef _ASM_ARC_ATOMIC_H
#define _ASM_ARC_ATOMIC_H #define _ASM_ARC_ATOMIC_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/types.h> #include <linux/types.h>
...@@ -228,5 +226,3 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) ...@@ -228,5 +226,3 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#endif #endif
#endif #endif
#endif
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#error only <linux/bitops.h> can be included directly #error only <linux/bitops.h> can be included directly
#endif #endif
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/types.h> #include <linux/types.h>
...@@ -508,6 +506,4 @@ static inline __attribute__ ((const)) int __ffs(unsigned long word) ...@@ -508,6 +506,4 @@ static inline __attribute__ ((const)) int __ffs(unsigned long word)
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif #endif
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#ifndef _ASM_ARC_CURRENT_H #ifndef _ASM_ARC_CURRENT_H
#define _ASM_ARC_CURRENT_H #define _ASM_ARC_CURRENT_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef CONFIG_ARC_CURR_IN_REG #ifdef CONFIG_ARC_CURR_IN_REG
...@@ -27,6 +25,4 @@ register struct task_struct *curr_arc asm("r25"); ...@@ -27,6 +25,4 @@ register struct task_struct *curr_arc asm("r25");
#endif /* ! __ASSEMBLY__ */ #endif /* ! __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_ARC_CURRENT_H */ #endif /* _ASM_ARC_CURRENT_H */
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
* -Conditionally disable interrupts (if they are not enabled, don't disable) * -Conditionally disable interrupts (if they are not enabled, don't disable)
*/ */
#ifdef __KERNEL__
#include <asm/arcregs.h> #include <asm/arcregs.h>
/* status32 Reg bits related to Interrupt Handling */ /* status32 Reg bits related to Interrupt Handling */
...@@ -169,6 +167,4 @@ static inline int arch_irqs_disabled(void) ...@@ -169,6 +167,4 @@ static inline int arch_irqs_disabled(void)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* KERNEL */
#endif #endif
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#ifndef __ASM_ARC_PROCESSOR_H #ifndef __ASM_ARC_PROCESSOR_H
#define __ASM_ARC_PROCESSOR_H #define __ASM_ARC_PROCESSOR_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/ptrace.h> #include <asm/ptrace.h>
...@@ -128,6 +126,4 @@ extern unsigned int get_wchan(struct task_struct *p); ...@@ -128,6 +126,4 @@ extern unsigned int get_wchan(struct task_struct *p);
*/ */
#define TASK_UNMAPPED_BASE (TASK_SIZE / 3) #define TASK_UNMAPPED_BASE (TASK_SIZE / 3)
#endif /* __KERNEL__ */
#endif /* __ASM_ARC_PROCESSOR_H */ #endif /* __ASM_ARC_PROCESSOR_H */
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
#define __HAVE_ARCH_MEMCPY #define __HAVE_ARCH_MEMCPY
#define __HAVE_ARCH_MEMCMP #define __HAVE_ARCH_MEMCMP
...@@ -36,5 +34,4 @@ extern char *strcpy(char *dest, const char *src); ...@@ -36,5 +34,4 @@ extern char *strcpy(char *dest, const char *src);
extern int strcmp(const char *cs, const char *ct); extern int strcmp(const char *cs, const char *ct);
extern __kernel_size_t strlen(const char *); extern __kernel_size_t strlen(const char *);
#endif /* __KERNEL__ */
#endif /* _ASM_ARC_STRING_H */ #endif /* _ASM_ARC_STRING_H */
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#ifndef _ASM_ARC_SYSCALLS_H #ifndef _ASM_ARC_SYSCALLS_H
#define _ASM_ARC_SYSCALLS_H 1 #define _ASM_ARC_SYSCALLS_H 1
#ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -22,6 +20,4 @@ int sys_arc_gettls(void); ...@@ -22,6 +20,4 @@ int sys_arc_gettls(void);
#include <asm-generic/syscalls.h> #include <asm-generic/syscalls.h>
#endif /* __KERNEL__ */
#endif #endif
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#ifndef _ASM_THREAD_INFO_H #ifndef _ASM_THREAD_INFO_H
#define _ASM_THREAD_INFO_H #define _ASM_THREAD_INFO_H
#ifdef __KERNEL__
#include <asm/page.h> #include <asm/page.h>
#ifdef CONFIG_16KSTACKS #ifdef CONFIG_16KSTACKS
...@@ -114,6 +112,4 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void) ...@@ -114,6 +112,4 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
* syscall, so all that reamins to be tested is _TIF_WORK_MASK * syscall, so all that reamins to be tested is _TIF_WORK_MASK
*/ */
#endif /* __KERNEL__ */
#endif /* _ASM_THREAD_INFO_H */ #endif /* _ASM_THREAD_INFO_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册