diff --git a/[refs] b/[refs]
index 6e68d8eae814..9fc190ac9877 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73f1d9391a6aa72efdcea2f302ee7bfcd313c631
+refs/heads/master: d2af12aeadaedf657c9fb9c3df984d2c5ab25f4c
diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h
index fee9e59649c1..691f59171c6c 100644
--- a/trunk/include/linux/linkage.h
+++ b/trunk/include/linux/linkage.h
@@ -21,6 +21,15 @@
 #define __page_aligned_data	__section(.data.page_aligned) __aligned(PAGE_SIZE)
 #define __page_aligned_bss	__section(.bss.page_aligned) __aligned(PAGE_SIZE)
 
+/*
+ * For assembly routines.
+ *
+ * Note when using these that you must specify the appropriate
+ * alignment directives yourself
+ */
+#define __PAGE_ALIGNED_DATA	.section ".data.page_aligned", "aw"
+#define __PAGE_ALIGNED_BSS	.section ".bss.page_aligned", "aw"
+
 /*
  * This is used by architectures to keep arguments on the stack
  * untouched by the compiler by keeping them live until the end.