Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / include / linux / linkage.h

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 14f329c64ba8ee54cf2c4166d09272167c836bd7..9fd1f859021b5018baffdb440261379dab4a55b3 100644 (file)
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,10 +1,9 @@
 #ifndef _LINUX_LINKAGE_H
 #define _LINUX_LINKAGE_H
 
+#include <linux/compiler.h>
 #include <asm/linkage.h>
 
-#define notrace __attribute__((no_instrument_function))
-
 #ifdef __cplusplus
 #define CPP_ASMLINKAGE extern "C"
 #else
@@ -19,6 +18,9 @@
 # define asmregparm
 #endif
 
+#define __page_aligned_data    __section(.data.page_aligned) __aligned(PAGE_SIZE)
+#define __page_aligned_bss     __section(.bss.page_aligned) __aligned(PAGE_SIZE)
+
 /*
  * This is used by architectures to keep arguments on the stack
  * untouched by the compiler by keeping them live until the end.