[PARISC] more ENTRY(), ENDPROC(), END() conversions

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

1 files changed, 13 insertions, 13 deletions

diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S
index 5e7bb90e7e08..43874ca3ed67 100644
--- a/arch/parisc/kernel/perf_asm.S
+++ b/arch/parisc/kernel/perf_asm.S
@@ -20,6 +20,7 @@
  */
 
 #include <asm/assembly.h>
+#include <linux/linkage.h>
 
 #ifdef CONFIG_64BIT
         .level          2.0w
@@ -41,10 +42,8 @@
 ; starting/stopping the coprocessor with the pmenb/pmdis.
 ;
         .text
-        .align 32
 
-        .export perf_intrigue_enable_perf_counters,code
-perf_intrigue_enable_perf_counters:
+ENTRY(perf_intrigue_enable_perf_counters)
         .proc
         .callinfo  frame=0,NO_CALLS
         .entry
@@ -69,9 +68,9 @@ perf_intrigue_enable_perf_counters:
         nop
         .exit
         .procend
+ENDPROC(perf_intrigue_enable_perf_counters)
 
-        .export perf_intrigue_disable_perf_counters,code
-perf_intrigue_disable_perf_counters:
+ENTRY(perf_intrigue_disable_perf_counters)
         .proc
         .callinfo  frame=0,NO_CALLS
         .entry
@@ -86,6 +85,7 @@ perf_intrigue_disable_perf_counters:
         mtctl   %r26,ccr                 ; turn off performance coprocessor
         .exit
         .procend
+ENDPROC(perf_intrigue_disable_perf_counters)
 
 ;***********************************************************************
 ;*
@@ -117,8 +117,7 @@ perf_intrigue_disable_perf_counters:
 ;*
 ;***********************************************************************
 
-        .export perf_rdr_shift_in_W,code
-perf_rdr_shift_in_W:
+ENTRY(perf_rdr_shift_in_W)
         .proc
         .callinfo frame=0,NO_CALLS
         .entry
@@ -550,6 +549,7 @@ perf_rdr_shift_in_W_leave:
         .exit
         MTDIAG_2        (24)                    ; restore DR2
         .procend
+ENDPROC(perf_rdr_shift_in_W)
 
 
 ;***********************************************************************
@@ -575,8 +575,7 @@ perf_rdr_shift_in_W_leave:
 ;*
 ;***********************************************************************
 
-        .export perf_rdr_shift_out_W,code
-perf_rdr_shift_out_W:
+ENTRY(perf_rdr_shift_out_W)
         .proc
         .callinfo frame=0,NO_CALLS
         .entry
@@ -983,6 +982,7 @@ perf_rdr_shift_out_W_leave:
         .exit
         MTDIAG_2        (23)                    ; restore DR2
         .procend
+ENDPROC(perf_rdr_shift_out_W)
 
 
 ;***********************************************************************
@@ -1012,8 +1012,7 @@ perf_rdr_shift_out_W_leave:
 ;*
 ;***********************************************************************
 
-        .export perf_rdr_shift_in_U,code
-perf_rdr_shift_in_U:
+ENTRY(perf_rdr_shift_in_U)
         .proc
         .callinfo frame=0,NO_CALLS
         .entry
@@ -1343,6 +1342,7 @@ perf_rdr_shift_in_U_leave:
         .exit
         MTDIAG_2        (24)                    ; restore DR2
         .procend
+ENDPROC(perf_rdr_shift_in_U)
 
 ;***********************************************************************
 ;*
@@ -1369,8 +1369,7 @@ perf_rdr_shift_in_U_leave:
 ;*
 ;***********************************************************************
 
-        .export perf_rdr_shift_out_U,code
-perf_rdr_shift_out_U:
+ENTRY(perf_rdr_shift_out_U)
         .proc
         .callinfo frame=0,NO_CALLS
         .entry
@@ -1687,4 +1686,5 @@ perf_rdr_shift_out_U_leave:
         .exit
         MTDIAG_2        (23)                    ; restore DR2
         .procend
+ENDPROC(perf_rdr_shift_out_U)