X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Flinux%2Fcompiler.h;h=62949aa638bbb8cf76de1510b2d0ba5b0b97d375;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=22d83706f4b2b4a4f7dc07c824dc7b2ae8126702;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 22d83706f..62949aa63 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -6,13 +6,17 @@
 # define __kernel	/* default address space */
 # define __safe		__attribute__((safe))
 # define __force	__attribute__((force))
+# define __iomem	__attribute__((noderef, address_space(2)))
 extern void __chk_user_ptr(void __user *);
+extern void __chk_io_ptr(void __iomem *);
 #else
 # define __user
 # define __kernel
 # define __safe
 # define __force
+# define __iomem
 # define __chk_user_ptr(x) (void)0
+# define __chk_io_ptr(x) (void)0
 #endif
 
 #ifdef __KERNEL__
@@ -124,4 +128,8 @@ extern void __chk_user_ptr(void __user *);
 #define noinline
 #endif
 
+#ifndef __always_inline
+#define __always_inline inline
+#endif
+
 #endif /* __LINUX_COMPILER_H */