Merge commit 'v2.6.39-rc3' into for-2.6.39

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

diff --git a/arch/s390/kernel/switch_cpu64.S b/arch/s390/kernel/switch_cpu64.S
index d94aacc..5be3f43 100644 (file)
--- a/arch/s390/kernel/switch_cpu64.S
+++ b/arch/s390/kernel/switch_cpu64.S
@@ -42,7 +42,9 @@ smp_restart_cpu:
        ltgr    %r4,%r4                 /* New stack ? */
        jz      1f
        lgr     %r15,%r4
-1:     basr    %r14,%r2
+1:     lgr     %r14,%r2                /* r14: Function to call */
+       lgr     %r2,%r3                 /* r2 : Parameter for function*/
+       basr    %r14,%r14               /* Call function */
 
        .section .data,"aw",@progbits
 .gprregs: