Subject: x86: Move #ifdef __KERNEL__ #ifdef __KERNEL can surround all off it. --- include/asm-x86/thread_info.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6.25-mm1/include/asm-x86/thread_info.h =================================================================== --- linux-2.6.25-mm1.orig/include/asm-x86/thread_info.h 2008-04-26 20:16:14.859898479 -0700 +++ linux-2.6.25-mm1/include/asm-x86/thread_info.h 2008-04-26 20:16:19.213639384 -0700 @@ -7,9 +7,10 @@ #ifndef _ASM_THREAD_INFO_H #define _ASM_THREAD_INFO_H -#ifdef CONFIG_X86_32 #ifdef __KERNEL__ +#ifdef CONFIG_X86_32 + #include #include @@ -203,9 +204,7 @@ static inline void set_restore_sigmask(v } #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ #else /* X86_32 */ -#ifdef __KERNEL__ #include #include @@ -388,7 +387,8 @@ static inline void set_restore_sigmask(v } #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ #endif /* X86_64 */ +#endif /* __KERNEL__ */ + #endif /* _ASM_THREAD_INFO_H */