1 files changed, 70 insertions, 70 deletions

diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index c1bee3ce9d1f..771b4e92e5d9 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -499,7 +499,7 @@ exc_##n##_bad_stack:							    \
         CHECK_NAPPING();                                                \
         addi    r3,r1,STACK_FRAME_OVERHEAD;                             \
         bl      hdlr;                                                   \
-        b       .ret_from_except_lite;
+        b       ret_from_except_lite;
 
 /* This value is used to mark exception frames on the stack. */
         .section        ".toc","aw"
@@ -550,11 +550,11 @@ interrupt_end_book3e:
         CRIT_EXCEPTION_PROLOG(0x100, BOOKE_INTERRUPT_CRITICAL,
                               PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON_CRIT(0x100)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         bl      special_reg_save
         CHECK_NAPPING();
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
         b       ret_from_crit_except
 
 /* Machine Check Interrupt */
@@ -562,11 +562,11 @@ interrupt_end_book3e:
         MC_EXCEPTION_PROLOG(0x000, BOOKE_INTERRUPT_MACHINE_CHECK,
                             PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON_MC(0x000)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         bl      special_reg_save
         CHECK_NAPPING();
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .machine_check_exception
+        bl      machine_check_exception
         b       ret_from_mc_except
 
 /* Data Storage Interrupt */
@@ -591,7 +591,7 @@ interrupt_end_book3e:
 
 /* External Input Interrupt */
         MASKABLE_EXCEPTION(0x500, BOOKE_INTERRUPT_EXTERNAL,
-                           external_input, .do_IRQ, ACK_NONE)
+                           external_input, do_IRQ, ACK_NONE)
 
 /* Alignment */
         START_EXCEPTION(alignment);
@@ -612,9 +612,9 @@ interrupt_end_book3e:
         std     r14,_DSISR(r1)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         ld      r14,PACA_EXGEN+EX_R14(r13)
-        bl      .save_nvgprs
-        bl      .program_check_exception
-        b       .ret_from_except
+        bl      save_nvgprs
+        bl      program_check_exception
+        b       ret_from_except
 
 /* Floating Point Unavailable Interrupt */
         START_EXCEPTION(fp_unavailable);
@@ -625,13 +625,13 @@ interrupt_end_book3e:
         ld      r12,_MSR(r1)
         andi.   r0,r12,MSR_PR;
         beq-    1f
-        bl      .load_up_fpu
+        bl      load_up_fpu
         b       fast_exception_return
 1:      INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_fp_unavailable_exception
-        b       .ret_from_except
+        bl      kernel_fp_unavailable_exception
+        b       ret_from_except
 
 /* Altivec Unavailable Interrupt */
         START_EXCEPTION(altivec_unavailable);
@@ -644,16 +644,16 @@ BEGIN_FTR_SECTION
         ld      r12,_MSR(r1)
         andi.   r0,r12,MSR_PR;
         beq-    1f
-        bl      .load_up_altivec
+        bl      load_up_altivec
         b       fast_exception_return
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
         INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .altivec_unavailable_exception
-        b       .ret_from_except
+        bl      altivec_unavailable_exception
+        b       ret_from_except
 
 /* AltiVec Assist */
         START_EXCEPTION(altivec_assist);
@@ -662,39 +662,39 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
                                 PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON(0x220)
         INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
-        bl      .altivec_assist_exception
+        bl      altivec_assist_exception
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #else
-        bl      .unknown_exception
+        bl      unknown_exception
 #endif
-        b       .ret_from_except
+        b       ret_from_except
 
 
 /* Decrementer Interrupt */
         MASKABLE_EXCEPTION(0x900, BOOKE_INTERRUPT_DECREMENTER,
-                           decrementer, .timer_interrupt, ACK_DEC)
+                           decrementer, timer_interrupt, ACK_DEC)
 
 /* Fixed Interval Timer Interrupt */
         MASKABLE_EXCEPTION(0x980, BOOKE_INTERRUPT_FIT,
-                           fixed_interval, .unknown_exception, ACK_FIT)
+                           fixed_interval, unknown_exception, ACK_FIT)
 
 /* Watchdog Timer Interrupt */
         START_EXCEPTION(watchdog);
         CRIT_EXCEPTION_PROLOG(0x9f0, BOOKE_INTERRUPT_WATCHDOG,
                               PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON_CRIT(0x9f0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         bl      special_reg_save
         CHECK_NAPPING();
         addi    r3,r1,STACK_FRAME_OVERHEAD
 #ifdef CONFIG_BOOKE_WDT
-        bl      .WatchdogException
+        bl      WatchdogException
 #else
-        bl      .unknown_exception
+        bl      unknown_exception
 #endif
         b       ret_from_crit_except
 
@@ -712,10 +712,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
                                 PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON(0xf20)
         INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
-        b       .ret_from_except
+        bl      unknown_exception
+        b       ret_from_except
 
 /* Debug exception as a critical interrupt*/
         START_EXCEPTION(debug_crit);
@@ -774,9 +774,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         mr      r4,r14
         ld      r14,PACA_EXCRIT+EX_R14(r13)
         ld      r15,PACA_EXCRIT+EX_R15(r13)
-        bl      .save_nvgprs
-        bl      .DebugException
-        b       .ret_from_except
+        bl      save_nvgprs
+        bl      DebugException
+        b       ret_from_except
 
 kernel_dbg_exc:
         b       .       /* NYI */
@@ -839,9 +839,9 @@ kernel_dbg_exc:
         mr      r4,r14
         ld      r14,PACA_EXDBG+EX_R14(r13)
         ld      r15,PACA_EXDBG+EX_R15(r13)
-        bl      .save_nvgprs
-        bl      .DebugException
-        b       .ret_from_except
+        bl      save_nvgprs
+        bl      DebugException
+        b       ret_from_except
 
         START_EXCEPTION(perfmon);
         NORMAL_EXCEPTION_PROLOG(0x260, BOOKE_INTERRUPT_PERFORMANCE_MONITOR,
@@ -850,23 +850,23 @@ kernel_dbg_exc:
         INTS_DISABLE
         CHECK_NAPPING()
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .performance_monitor_exception
-        b       .ret_from_except_lite
+        bl      performance_monitor_exception
+        b       ret_from_except_lite
 
 /* Doorbell interrupt */
         MASKABLE_EXCEPTION(0x280, BOOKE_INTERRUPT_DOORBELL,
-                           doorbell, .doorbell_exception, ACK_NONE)
+                           doorbell, doorbell_exception, ACK_NONE)
 
 /* Doorbell critical Interrupt */
         START_EXCEPTION(doorbell_crit);
         CRIT_EXCEPTION_PROLOG(0x2a0, BOOKE_INTERRUPT_DOORBELL_CRITICAL,
                               PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON_CRIT(0x2a0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         bl      special_reg_save
         CHECK_NAPPING();
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
         b       ret_from_crit_except
 
 /*
@@ -878,21 +878,21 @@ kernel_dbg_exc:
                                 PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON(0x2c0)
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
         INTS_RESTORE_HARD
-        bl      .unknown_exception
-        b       .ret_from_except
+        bl      unknown_exception
+        b       ret_from_except
 
 /* Guest Doorbell critical Interrupt */
         START_EXCEPTION(guest_doorbell_crit);
         CRIT_EXCEPTION_PROLOG(0x2e0, BOOKE_INTERRUPT_GUEST_DBELL_CRIT,
                               PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON_CRIT(0x2e0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         bl      special_reg_save
         CHECK_NAPPING();
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
         b       ret_from_crit_except
 
 /* Hypervisor call */
@@ -901,10 +901,10 @@ kernel_dbg_exc:
                                 PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON(0x310)
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
         INTS_RESTORE_HARD
-        bl      .unknown_exception
-        b       .ret_from_except
+        bl      unknown_exception
+        b       ret_from_except
 
 /* Embedded Hypervisor priviledged  */
         START_EXCEPTION(ehpriv);
@@ -912,10 +912,10 @@ kernel_dbg_exc:
                                 PROLOG_ADDITION_NONE)
         EXCEPTION_COMMON(0x320)
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
         INTS_RESTORE_HARD
-        bl      .unknown_exception
-        b       .ret_from_except
+        bl      unknown_exception
+        b       ret_from_except
 
 /* LRAT Error interrupt */
         START_EXCEPTION(lrat_error);
@@ -1014,16 +1014,16 @@ storage_fault_common:
         mr      r5,r15
         ld      r14,PACA_EXGEN+EX_R14(r13)
         ld      r15,PACA_EXGEN+EX_R15(r13)
-        bl      .do_page_fault
+        bl      do_page_fault
         cmpdi   r3,0
         bne-    1f
-        b       .ret_from_except_lite
-1:      bl      .save_nvgprs
+        b       ret_from_except_lite
+1:      bl      save_nvgprs
         mr      r5,r3
         addi    r3,r1,STACK_FRAME_OVERHEAD
         ld      r4,_DAR(r1)
-        bl      .bad_page_fault
-        b       .ret_from_except
+        bl      bad_page_fault
+        b       ret_from_except
 
 /*
  * Alignment exception doesn't fit entirely in the 0x100 bytes so it
@@ -1035,10 +1035,10 @@ alignment_more:
         addi    r3,r1,STACK_FRAME_OVERHEAD
         ld      r14,PACA_EXGEN+EX_R14(r13)
         ld      r15,PACA_EXGEN+EX_R15(r13)
-        bl      .save_nvgprs
+        bl      save_nvgprs
         INTS_RESTORE_HARD
-        bl      .alignment_exception
-        b       .ret_from_except
+        bl      alignment_exception
+        b       ret_from_except
 
 /*
  * We branch here from entry_64.S for the last stage of the exception
@@ -1172,7 +1172,7 @@ bad_stack_book3e:
         std     r12,0(r11)
         ld      r2,PACATOC(r13)
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_bad_stack
+        bl      kernel_bad_stack
         b       1b
 
 /*
@@ -1521,13 +1521,13 @@ _GLOBAL(start_initialization_book3e)
          * and always use AS 0, so we just set it up to match our link
          * address and never use 0 based addresses.
          */
-        bl      .initial_tlb_book3e
+        bl      initial_tlb_book3e
 
         /* Init global core bits */
-        bl      .init_core_book3e
+        bl      init_core_book3e
 
         /* Init per-thread bits */
-        bl      .init_thread_book3e
+        bl      init_thread_book3e
 
         /* Return to common init code */
         tovirt(r28,r28)
@@ -1548,7 +1548,7 @@ _GLOBAL(start_initialization_book3e)
  */
 _GLOBAL(book3e_secondary_core_init_tlb_set)
         li      r4,1
-        b       .generic_secondary_smp_init
+        b       generic_secondary_smp_init
 
 _GLOBAL(book3e_secondary_core_init)
         mflr    r28
@@ -1558,18 +1558,18 @@ _GLOBAL(book3e_secondary_core_init)
         bne     2f
 
         /* Setup TLB for this core */
-        bl      .initial_tlb_book3e
+        bl      initial_tlb_book3e
 
         /* We can return from the above running at a different
          * address, so recalculate r2 (TOC)
          */
-        bl      .relative_toc
+        bl      relative_toc
 
         /* Init global core bits */
-2:      bl      .init_core_book3e
+2:      bl      init_core_book3e
 
         /* Init per-thread bits */
-3:      bl      .init_thread_book3e
+3:      bl      init_thread_book3e
 
         /* Return to common init code at proper virtual address.
          *
@@ -1596,14 +1596,14 @@ _GLOBAL(book3e_secondary_thread_init)
         mflr    r28
         b       3b
 
-_STATIC(init_core_book3e)
+init_core_book3e:
         /* Establish the interrupt vector base */
         LOAD_REG_IMMEDIATE(r3, interrupt_base_book3e)
         mtspr   SPRN_IVPR,r3
         sync
         blr
 
-_STATIC(init_thread_book3e)
+init_thread_book3e:
         lis     r3,(SPRN_EPCR_ICM | SPRN_EPCR_GICM)@h
         mtspr   SPRN_EPCR,r3