Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / s390 / kernel / switch_cpu.S

diff --git a/arch/s390/kernel/switch_cpu.S b/arch/s390/kernel/switch_cpu.S
index 20530dd..bfe070b 100644 (file)
--- a/arch/s390/kernel/switch_cpu.S
+++ b/arch/s390/kernel/switch_cpu.S
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/ptrace.h>
 
@@ -16,9 +17,7 @@
 #           %r6 - destination cpu
 
        .section .text
-       .align 4
-       .globl smp_switch_to_cpu
-smp_switch_to_cpu:
+ENTRY(smp_switch_to_cpu)
        stm     %r6,%r15,__SF_GPRS(%r15)
        lr      %r1,%r15
        ahi     %r15,-STACK_FRAME_OVERHEAD
@@ -33,8 +32,7 @@ smp_switch_to_cpu:
        brc     2,2b                    /* busy, try again */
 3:     j       3b
 
-       .globl  smp_restart_cpu
-smp_restart_cpu:
+ENTRY(smp_restart_cpu)
        basr    %r13,0
 0:     la      %r1,.gprregs_addr-0b(%r13)
        l       %r1,0(%r1)