Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 2cb1d9487796..0ae5d57b9368 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -312,5 +312,17 @@ int main(void)
 #ifdef CONFIG_BUG
         DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
 #endif
+
+#ifdef CONFIG_PPC_ISERIES
+        /* the assembler miscalculates the VSID values */
+        DEFINE(PAGE_OFFSET_ESID, GET_ESID(PAGE_OFFSET));
+        DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
+        DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
+        DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
+#endif
+
+#ifdef CONFIG_PPC64
+        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
+#endif
         return 0;
 }