3 files changed, 19 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index b629198b072c..2d92eeb08b76 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -1021,7 +1021,7 @@ _GLOBAL(enter_rtas)
         std     r6,PACASAVEDMSR(r13)
 
         /* Setup our real return addr */        
-        LOAD_REG_ADDR(r4,.rtas_return_loc)
+        LOAD_REG_ADDR(r4,rtas_return_loc)
         clrldi  r4,r4,2                 /* convert to realmode address */
         mtlr    r4
 
@@ -1045,7 +1045,7 @@ _GLOBAL(enter_rtas)
         rfid
         b       .       /* prevent speculative execution */
 
-_STATIC(rtas_return_loc)
+rtas_return_loc:
         FIXUP_ENDIAN
 
         /* relocation is off at this point */
@@ -1054,7 +1054,7 @@ _STATIC(rtas_return_loc)
 
         bcl     20,31,$+4
 0:      mflr    r3
-        ld      r3,(1f-0b)(r3)          /* get &.rtas_restore_regs */
+        ld      r3,(1f-0b)(r3)          /* get &rtas_restore_regs */
 
         mfmsr   r6
         li      r0,MSR_RI
@@ -1071,9 +1071,9 @@ _STATIC(rtas_return_loc)
         b       .       /* prevent speculative execution */
 
         .align  3
-1:      .llong  .rtas_restore_regs
+1:      .llong  rtas_restore_regs
 
-_STATIC(rtas_restore_regs)
+rtas_restore_regs:
         /* relocation is on at this point */
         REST_GPR(2, r1)                 /* Restore the TOC */
         REST_GPR(13, r1)                /* Restore paca */
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 28391e048120..f2f9d6144ae1 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -214,13 +214,13 @@ data_access_slb_pSeries:
         b       slb_miss_realmode
 #else
         /*
-         * We can't just use a direct branch to .slb_miss_realmode
+         * We can't just use a direct branch to slb_miss_realmode
          * because the distance from here to there depends on where
          * the kernel ends up being put.
          */
         mfctr   r11
         ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
         mtctr   r10
         bctr
 #endif
@@ -247,7 +247,7 @@ instruction_access_slb_pSeries:
 #else
         mfctr   r11
         ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
         mtctr   r10
         bctr
 #endif
@@ -524,7 +524,7 @@ do_stab_bolted_pSeries:
         std     r12,PACA_EXSLB+EX_R12(r13)
         GET_SCRATCH0(r10)
         std     r10,PACA_EXSLB+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted, EXC_STD)
+        EXCEPTION_PROLOG_PSERIES_1(do_stab_bolted, EXC_STD)
 
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_STD, 0x300)
         KVM_HANDLER_SKIP(PACA_EXSLB, EXC_STD, 0x380)
@@ -832,13 +832,13 @@ data_access_slb_relon_pSeries:
         b       slb_miss_realmode
 #else
         /*
-         * We can't just use a direct branch to .slb_miss_realmode
+         * We can't just use a direct branch to slb_miss_realmode
          * because the distance from here to there depends on where
          * the kernel ends up being put.
          */
         mfctr   r11
         ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
         mtctr   r10
         bctr
 #endif
@@ -858,7 +858,7 @@ instruction_access_slb_relon_pSeries:
 #else
         mfctr   r11
         ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
         mtctr   r10
         bctr
 #endif
@@ -1468,7 +1468,7 @@ machine_check_handle_early:
  * r3 is saved in paca->slb_r3
  * We assume we aren't going to take any exceptions during this procedure.
  */
-_GLOBAL(slb_miss_realmode)
+slb_miss_realmode:
         mflr    r10
 #ifdef CONFIG_RELOCATABLE
         mtctr   r11
@@ -1646,7 +1646,7 @@ do_ste_alloc:
  * We assume (DAR >> 60) == 0xc.
  */
         .align  7
-_GLOBAL(do_stab_bolted)
+do_stab_bolted:
         stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
         std     r11,PACA_EXSLB+EX_SRR0(r13)     /* save SRR0 in exc. frame */
         mfspr   r11,SPRN_DAR                    /* ea */
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index afcfd631bf7f..8d7c868e5a43 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -639,7 +639,7 @@ __secondary_start:
         stb     r0,PACAIRQHAPPENED(r13)
 
         /* enable MMU and jump to start_secondary */
-        LOAD_REG_ADDR(r3, .start_secondary_prolog)
+        LOAD_REG_ADDR(r3, start_secondary_prolog)
         LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
 
         mtspr   SPRN_SRR0,r3
@@ -652,7 +652,7 @@ __secondary_start:
  * zero the stack back-chain pointer and get the TOC virtual address
  * before going into C code.
  */
-_GLOBAL(start_secondary_prolog)
+start_secondary_prolog:
         ld      r2,PACATOC(r13)
         li      r3,0
         std     r3,0(r1)                /* Zero the stack frame pointer */
@@ -778,7 +778,7 @@ _INIT_STATIC(start_here_multiplatform)
         mr      r3,r31
         bl      early_setup             /* also sets r13 and SPRG_PACA */
 
-        LOAD_REG_ADDR(r3, .start_here_common)
+        LOAD_REG_ADDR(r3, start_here_common)
         ld      r4,PACAKMSR(r13)
         mtspr   SPRN_SRR0,r3
         mtspr   SPRN_SRR1,r4
@@ -786,7 +786,8 @@ _INIT_STATIC(start_here_multiplatform)
         b       .       /* prevent speculative execution */
         
         /* This is where all platforms converge execution */
-_INIT_GLOBAL(start_here_common)
+
+start_here_common:
         /* relocation is on at this point */
         std     r1,PACAKSAVE(r13)