From: "Robert P. J. Day" <rpjday@crashcourse.ca>

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-generic/bitops.h       |    4 ----
 include/asm-generic/futex.h        |    3 ---
 include/asm-generic/memory_model.h |    2 --
 include/asm-generic/page.h         |    2 --
 include/asm-generic/rtc.h          |    3 ---
 5 files changed, 14 deletions(-)

diff -puN include/asm-generic/bitops.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic include/asm-generic/bitops.h
--- a/include/asm-generic/bitops.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic
+++ a/include/asm-generic/bitops.h
@@ -17,8 +17,6 @@
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/find.h>
 
-#ifdef __KERNEL__
-
 #ifndef _LINUX_BITOPS_H
 #error only <linux/bitops.h> can be included directly
 #endif
@@ -32,6 +30,4 @@
 #include <asm-generic/bitops/ext2-atomic.h>
 #include <asm-generic/bitops/minix.h>
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_BITOPS_H */
diff -puN include/asm-generic/futex.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic include/asm-generic/futex.h
--- a/include/asm-generic/futex.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic
+++ a/include/asm-generic/futex.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_GENERIC_FUTEX_H
 #define _ASM_GENERIC_FUTEX_H
 
-#ifdef __KERNEL__
-
 #include <linux/futex.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
@@ -56,4 +54,3 @@ futex_atomic_cmpxchg_inatomic(int __user
 }
 
 #endif
-#endif
diff -puN include/asm-generic/memory_model.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic include/asm-generic/memory_model.h
--- a/include/asm-generic/memory_model.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic
+++ a/include/asm-generic/memory_model.h
@@ -1,7 +1,6 @@
 #ifndef __ASM_MEMORY_MODEL_H
 #define __ASM_MEMORY_MODEL_H
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_FLATMEM)
@@ -81,6 +80,5 @@ extern unsigned long page_to_pfn(struct 
 #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
 
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 
 #endif
diff -puN include/asm-generic/page.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic include/asm-generic/page.h
--- a/include/asm-generic/page.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic
+++ a/include/asm-generic/page.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_GENERIC_PAGE_H
 #define _ASM_GENERIC_PAGE_H
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #include <linux/compiler.h>
@@ -21,6 +20,5 @@ static __inline__ __attribute_const__ in
 }
 
 #endif	/* __ASSEMBLY__ */
-#endif	/* __KERNEL__ */
 
 #endif	/* _ASM_GENERIC_PAGE_H */
diff -puN include/asm-generic/rtc.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic include/asm-generic/rtc.h
--- a/include/asm-generic/rtc.h~remove-__kernel__-tests-of-unexported-headers-under-asm-generic
+++ a/include/asm-generic/rtc.h
@@ -12,8 +12,6 @@
 #ifndef __ASM_RTC_H__
 #define __ASM_RTC_H__
 
-#ifdef __KERNEL__
-
 #include <linux/mc146818rtc.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
@@ -213,5 +211,4 @@ static inline int set_rtc_pll(struct rtc
 	return -EINVAL;
 }
 
-#endif /* __KERNEL__ */
 #endif /* __ASM_RTC_H__ */
_