[PATCH] ppc64: remove another fixed address constraint

Presently the LparMap, one of the structures the kernel shares with the
legacy iSeries hypervisor has a fixed offset address in head.S.  This patch
changes this so the LparMap is a normally initialized structure, without
fixed address.  This allows us to use macros to compute some of the values
in the structure, which wasn't previously possible because the assembler
always uses signed-% which gets the wrong answers for the computations in
question.

Unfortunately, a gcc bug means that doing this requires another structure
(hvReleaseData) to be initialized in asm instead of C, but on the whole the
result is cleaner than before.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 30 deletions

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 3f447712e3f..74fc3bc6860 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -522,36 +522,9 @@ __end_interrupts:
 #ifdef CONFIG_PPC_ISERIES
         .globl naca
 naca:
-        .llong itVpdAreas
-
-        /*
-         * The iSeries LPAR map is at this fixed address
-         * so that the HvReleaseData structure can address
-         * it with a 32-bit offset.
-         *
-         * The VSID values below are dependent on the
-         * VSID generation algorithm.  See include/asm/mmu_context.h.
-         */
-
-        . = 0x4800
-
-        .llong  2               /* # ESIDs to be mapped by hypervisor    */
-        .llong  1               /* # memory ranges to be mapped by hypervisor */
-        .llong  STAB0_PAGE      /* Page # of segment table within load area     */
-        .llong  0               /* Reserved */
-        .llong  0               /* Reserved */
-        .llong  0               /* Reserved */
-        .llong  0               /* Reserved */
-        .llong  0               /* Reserved */
-        .llong  (KERNELBASE>>SID_SHIFT)
-        .llong  0x408f92c94     /* KERNELBASE VSID */
-        /* We have to list the bolted VMALLOC segment here, too, so that it
-         * will be restored on shared processor switch */
-        .llong  (VMALLOCBASE>>SID_SHIFT)
-        .llong  0xf09b89af5     /* VMALLOCBASE VSID */
-        .llong  8192            /* # pages to map (32 MB) */
-        .llong  0               /* Offset from start of loadarea to start of map */
-        .llong  0x408f92c940000 /* VPN of first page to map */
+        .llong  itVpdAreas
+        .llong  0               /* xRamDisk */
+        .llong  0               /* xRamDiskSize */
 
         . = 0x6100