1 files changed, 4 insertions, 38 deletions

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 93ebcac0d5a2..784f56d4684c 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
 
@@ -2098,7 +2071,7 @@ _GLOBAL(hmt_start_secondary)
         blr
 #endif
 
-#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES)
+#if defined(CONFIG_KEXEC) || (defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES))
 _GLOBAL(smp_release_cpus)
         /* All secondary cpus are spinning on a common
          * spinloop, release them all now so they can start
@@ -2131,13 +2104,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  4096
 
-#ifdef CONFIG_SMP
-/* 1 page segment table per cpu (max 48, cpu0 allocated at STAB0_PHYS_ADDR) */
-        .globl  stab_array
-stab_array:
-        .space  4096 * 48
-#endif
-        
 /*
  * This space gets a copy of optional info passed to us by the bootstrap
  * Used to pass parameters into the kernel like root=/dev/sda1, etc.