From f6818053a3e17195161577e5e4aaa6828b3c99aa Mon Sep 17 00:00:00 2001
From: John Williams <john.williams@petalogix.com>
Date: Mon, 22 Jun 2009 01:38:13 +0200
Subject: [PATCH] --- yaml --- r: 165951 b: refs/heads/master c:
 a1253977dff4a033d61a7a96608f5a0bbb36dbf6 h: refs/heads/master i:   165949:
 78f6f9357a09fbe4ec189db80a0bc42c734bd93a   165947:
 7157f43fd911027ba18a69dbc8a6401cfb0b57ed   165943:
 d7b82a8877d9bc9302566c1d29c484289aecce10   165935:
 a8c029535e7567c78bf16b53944322137bf2abb2   165919:
 4ed29045d4670867ccac8bfd1b188abd89d353ee   165887:
 0599574260c130641aaf6115c77cf9fe98747b42 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/microblaze/include/asm/page.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f33a94b9abff..4e5c750ef7db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19086765140e979d955b536f87e755af43f3fdf5
+refs/heads/master: a1253977dff4a033d61a7a96608f5a0bbb36dbf6
diff --git a/trunk/arch/microblaze/include/asm/page.h b/trunk/arch/microblaze/include/asm/page.h
index 72aceae88680..880c988c2237 100644
--- a/trunk/arch/microblaze/include/asm/page.h
+++ b/trunk/arch/microblaze/include/asm/page.h
@@ -17,6 +17,7 @@
 
 #include <linux/pfn.h>
 #include <asm/setup.h>
+#include <asm/asm-compat.h>
 #include <linux/const.h>
 
 #ifdef __KERNEL__
@@ -26,6 +27,8 @@
 #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
+#define LOAD_OFFSET	ASM_CONST((CONFIG_KERNEL_START-CONFIG_KERNEL_BASE_ADDR))
+
 #ifndef __ASSEMBLY__
 
 #define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))