diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 16:36:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 16:36:14 +0200 |
| commit | bb3c90f0de7b34995b5e35cf5dc97a3d428b3761 (patch) | |
| tree | d5d07b61c0ab6d8688579a255e2b97b624637336 /arch/s390/kernel/switch_cpu.S | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
| parent | [S390] compile fix for latest binutils (diff) | |
| download | linux-bb3c90f0de7b34995b5e35cf5dc97a3d428b3761.tar.xz linux-bb3c90f0de7b34995b5e35cf5dc97a3d428b3761.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] compile fix for latest binutils
[S390] cio: prevent purging of CCW devices in the online state
[S390] qdio: fix init sequence
[S390] Fix parameter passing for smp_switch_to_cpu()
[S390] oprofile s390: prevent stack corruption
Diffstat (limited to 'arch/s390/kernel/switch_cpu.S')
| -rw-r--r-- | arch/s390/kernel/switch_cpu.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kernel/switch_cpu.S b/arch/s390/kernel/switch_cpu.S index 469f11b574fa..20530dd2eab1 100644 --- a/arch/s390/kernel/switch_cpu.S +++ b/arch/s390/kernel/switch_cpu.S @@ -46,7 +46,9 @@ smp_restart_cpu: ltr %r4,%r4 /* New stack ? */ jz 1f lr %r15,%r4 -1: basr %r14,%r2 +1: lr %r14,%r2 /* r14: Function to call */ + lr %r2,%r3 /* r2 : Parameter for function*/ + basr %r14,%r14 /* Call function */ .gprregs_addr: .long .gprregs |