Messages in this thread Patch in this message | | | Date | Tue, 1 Apr 2008 21:08:09 -0400 (EDT) | From | "Robert P. J. Day" <> | Subject | [PATCH] Remove __KERNEL__ tests of unexported headers under asm-generic/. |
| |
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
just another directory's worth of cleanup ...
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 --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h index 15e6f25..c9f369c 100644 --- a/include/asm-generic/bitops.h +++ b/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 --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index f422df0..81644fd 100644 --- a/include/asm-generic/futex.h +++ b/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 <asm/errno.h> #include <asm/uaccess.h> @@ -56,4 +54,3 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) }
#endif -#endif diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 52226e1..ae060c6 100644 --- a/include/asm-generic/memory_model.h +++ b/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 page *page); #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
#endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */
#endif diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index a96b5d9..14db733 100644 --- a/include/asm-generic/page.h +++ b/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__ int get_order(unsigned long size) }
#endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */
#endif /* _ASM_GENERIC_PAGE_H */ diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index dd1bed8..be4af00 100644 --- a/include/asm-generic/rtc.h +++ b/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_pll_info *pll) return -EINVAL; }
-#endif /* __KERNEL__ */ #endif /* __ASM_RTC_H__ */ ======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry: Have classroom, will lecture. http://crashcourse.ca Waterloo, Ontario, CANADA ========================================================================
| |