1 files changed, 2 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 2d14774af6b4..f765b0434731 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -401,7 +401,7 @@ generic_secondary_common_init:
         ld      r12,CPU_SPEC_RESTORE(r23)
         cmpdi   0,r12,0
         beq     3f
-#if !defined(_CALL_ELF) || _CALL_ELF != 2
+#ifdef PPC64_ELF_ABI_v1
         ld      r12,0(r12)
 #endif
         mtctr   r12
@@ -941,7 +941,7 @@ start_here_multiplatform:
         mtspr   SPRN_SRR1,r4
         RFI
         b       .       /* prevent speculative execution */
-        
+
         /* This is where all platforms converge execution */
 
 start_here_common:
@@ -951,9 +951,6 @@ start_here_common:
         /* Load the TOC (virtual address) */
         ld      r2,PACATOC(r13)
 
-        /* Do more system initializations in virtual mode */
-        bl      setup_system
-
         /* Mark interrupts soft and hard disabled (they might be enabled
          * in the PACA when doing hotplug)
          */