Messages in this thread Patch in this message | | | Subject | [FIX REQUEST] x86: Remove avoidable multiple ifdef blocks | From | Jaswinder Singh Rajput <> | Date | Mon, 13 Jul 2009 12:45:12 +0530 |
| |
In -tip there are many instances where multiple ifdefs are used which can be easily avoidable to make core more readable and consistent.
Like multiple 'ifdef __KERNEL__' in asm/bitops.h :
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h index 02b47a6..477f556 100644 --- a/arch/x86/include/asm/bitops.h +++ b/arch/x86/include/asm/bitops.h @@ -434,11 +434,6 @@ static inline int fls(int x) #endif return r + 1; } -#endif /* __KERNEL__ */ - -#undef ADDR - -#ifdef __KERNEL__ #include <asm-generic/bitops/sched.h> @@ -446,12 +441,6 @@ static inline int fls(int x) #include <asm-generic/bitops/hweight.h> -#endif /* __KERNEL__ */ - -#include <asm-generic/bitops/fls64.h> - -#ifdef __KERNEL__ - #include <asm-generic/bitops/ext2-non-atomic.h> #define ext2_set_bit_atomic(lock, nr, addr) \ @@ -462,4 +451,9 @@ static inline int fls(int x) #include <asm-generic/bitops/minix.h> #endif /* __KERNEL__ */ + +#undef ADDR + +#include <asm-generic/bitops/fls64.h> + #endif /* _ASM_X86_BITOPS_H */ Similarly in ifdef __KERNEL__ in asm/e820.h and asm/signal.h
And similarly others ifdef block.
Thanks, -- JSR
| |