From: David Gibson <david@gibson.dropbear.id.au>
Date: Fri, 16 Dec 2005 03:49:25 +0000 (+1100)
Subject: [PATCH] powerpc: Fix iSeries bug in VMALLOCBASE/VMALLOC_START consolidation
X-Git-Tag: v2.6.16-rc1~666^2~38
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=e1333803c3a8fb167ba67ffc5540dbb53fa7deb3;p=powerpc.git

[PATCH] powerpc: Fix iSeries bug in VMALLOCBASE/VMALLOC_START consolidation

Oops, forgot to compile the VMALLOCBASE/VMALLOC_START patch on
iSeries.  VMALLOC_START is defined in pgtable.h whereas previously
VMALLOCBASE was previously defined in page.h.  lparmap.c needs to be
updated appropriately.

Booted on iSeries RS64 (now).

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c
index 92d9474475..584d1e3c01 100644
--- a/arch/powerpc/kernel/lparmap.c
+++ b/arch/powerpc/kernel/lparmap.c
@@ -7,7 +7,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <asm/mmu.h>
-#include <asm/page.h>
+#include <asm/pgtable.h>
 #include <asm/iseries/lpar_map.h>
 
 const struct LparMap __attribute__((__section__(".text"))) xLparMap = {