From: Adrian Bunk Nothing from the bottom of this header is part of the kernel<->userspace ABI. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- include/linux/kernel.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff -puN include/linux/kernel.h~include-linux-kernelh-userspace-header-cleanup include/linux/kernel.h --- a/include/linux/kernel.h~include-linux-kernelh-userspace-header-cleanup +++ a/include/linux/kernel.h @@ -455,7 +455,19 @@ static inline char *pack_hex_byte(char * struct sysinfo; extern int do_sysinfo(struct sysinfo *info); -#endif /* __KERNEL__ */ +/* This helps us to avoid #ifdef CONFIG_NUMA */ +#ifdef CONFIG_NUMA +#define NUMA_BUILD 1 +#else +#define NUMA_BUILD 0 +#endif + +/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ +#ifdef CONFIG_FTRACE_MCOUNT_RECORD +# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD +#endif + +#endif /* __KERNEL__ */ #define SI_LOAD_SHIFT 16 struct sysinfo { @@ -475,16 +487,4 @@ struct sysinfo { char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ }; -/* This helps us to avoid #ifdef CONFIG_NUMA */ -#ifdef CONFIG_NUMA -#define NUMA_BUILD 1 -#else -#define NUMA_BUILD 0 -#endif - -/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ -#ifdef CONFIG_FTRACE_MCOUNT_RECORD -# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD -#endif - #endif _