X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Flinux%2Fkernel.h;h=a123b13b70fd80cb12def4c100ee198606b7c6b6;hb=f4e0b4c5e1c3eac9b7376ce73fb63de436057db1;hp=2451f1f7a1d969f29bb2a3137c846566bfaf614a;hpb=578f1ef91aa92beb571bfb9af8f4d18f405f3b9e;p=~andy%2Flinux

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 2451f1f7a1d..a123b13b70f 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -1,15 +1,6 @@
 #ifndef _LINUX_KERNEL_H
 #define _LINUX_KERNEL_H
 
-#include <linux/sysinfo.h>
-
-/*
- * 'kernel.h' contains some often-used function prototypes etc
- */
-#define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
-
-#ifdef __KERNEL__
 
 #include <stdarg.h>
 #include <linux/linkage.h>
@@ -22,6 +13,7 @@
 #include <linux/printk.h>
 #include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
+#include <uapi/linux/kernel.h>
 
 #define USHRT_MAX	((u16)(~0U))
 #define SHRT_MAX	((s16)(USHRT_MAX>>1))
@@ -716,6 +708,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 
 extern int do_sysinfo(struct sysinfo *info);
 
-#endif /* __KERNEL__ */
-
 #endif