Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfi...

[linux-2.6] / arch / powerpc / kernel / lparmap.c

diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c
index 8a53d436ad9a6d11da376e23e851d02d0cdca936..af11285ffbd1d2b7f69acfbc8aacd5ddc6f1ddca 100644 (file)
--- a/arch/powerpc/kernel/lparmap.c
+++ b/arch/powerpc/kernel/lparmap.c
@@ -7,10 +7,11 @@
  * 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 = {
+/* The # is to stop gcc trying to make .text nonexecutable */
+const struct LparMap __attribute__((__section__(".text #"))) xLparMap = {
        .xNumberEsids = HvEsidsToMap,
        .xNumberRanges = HvRangesToMap,
        .xSegmentTableOffs = STAB0_PAGE,
@@ -18,8 +19,8 @@ const struct LparMap __attribute__((__section__(".text"))) xLparMap = {
        .xEsids = {
                { .xKernelEsid = GET_ESID(PAGE_OFFSET),
                  .xKernelVsid = KERNEL_VSID(PAGE_OFFSET), },
-               { .xKernelEsid = GET_ESID(VMALLOCBASE),
-                 .xKernelVsid = KERNEL_VSID(VMALLOCBASE), },
+               { .xKernelEsid = GET_ESID(VMALLOC_START),
+                 .xKernelVsid = KERNEL_VSID(VMALLOC_START), },
        },
 
        .xRanges = {