Commit ae50884f authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds

remove __KERNEL__ tests of unexported headers under asm-generic/

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 735643ee
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <asm-generic/bitops/fls64.h> #include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/find.h>
#ifdef __KERNEL__
#ifndef _LINUX_BITOPS_H #ifndef _LINUX_BITOPS_H
#error only <linux/bitops.h> can be included directly #error only <linux/bitops.h> can be included directly
#endif #endif
...@@ -32,6 +30,4 @@ ...@@ -32,6 +30,4 @@
#include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */
#endif /* _ASM_GENERIC_BITOPS_H */ #endif /* _ASM_GENERIC_BITOPS_H */
#ifndef _ASM_GENERIC_FUTEX_H #ifndef _ASM_GENERIC_FUTEX_H
#define _ASM_GENERIC_FUTEX_H #define _ASM_GENERIC_FUTEX_H
#ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
...@@ -56,4 +54,3 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) ...@@ -56,4 +54,3 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
} }
#endif #endif
#endif
#ifndef __ASM_MEMORY_MODEL_H #ifndef __ASM_MEMORY_MODEL_H
#define __ASM_MEMORY_MODEL_H #define __ASM_MEMORY_MODEL_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#if defined(CONFIG_FLATMEM) #if defined(CONFIG_FLATMEM)
...@@ -81,6 +80,5 @@ extern unsigned long page_to_pfn(struct page *page); ...@@ -81,6 +80,5 @@ extern unsigned long page_to_pfn(struct page *page);
#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif #endif
#ifndef _ASM_GENERIC_PAGE_H #ifndef _ASM_GENERIC_PAGE_H
#define _ASM_GENERIC_PAGE_H #define _ASM_GENERIC_PAGE_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -21,6 +20,5 @@ static __inline__ __attribute_const__ int get_order(unsigned long size) ...@@ -21,6 +20,5 @@ static __inline__ __attribute_const__ int get_order(unsigned long size)
} }
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_GENERIC_PAGE_H */ #endif /* _ASM_GENERIC_PAGE_H */
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#ifndef __ASM_RTC_H__ #ifndef __ASM_RTC_H__
#define __ASM_RTC_H__ #define __ASM_RTC_H__
#ifdef __KERNEL__
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/bcd.h> #include <linux/bcd.h>
...@@ -213,5 +211,4 @@ static inline int set_rtc_pll(struct rtc_pll_info *pll) ...@@ -213,5 +211,4 @@ static inline int set_rtc_pll(struct rtc_pll_info *pll)
return -EINVAL; return -EINVAL;
} }
#endif /* __KERNEL__ */
#endif /* __ASM_RTC_H__ */ #endif /* __ASM_RTC_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment