diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/s390/kernel/switch_cpu64.S | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/s390/kernel/switch_cpu64.S')
| -rw-r--r-- | arch/s390/kernel/switch_cpu64.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kernel/switch_cpu64.S b/arch/s390/kernel/switch_cpu64.S index d94aacc898c..5be3f43898f 100644 --- a/arch/s390/kernel/switch_cpu64.S +++ b/arch/s390/kernel/switch_cpu64.S | |||
| @@ -42,7 +42,9 @@ smp_restart_cpu: | |||
| 42 | ltgr %r4,%r4 /* New stack ? */ | 42 | ltgr %r4,%r4 /* New stack ? */ |
| 43 | jz 1f | 43 | jz 1f |
| 44 | lgr %r15,%r4 | 44 | lgr %r15,%r4 |
| 45 | 1: basr %r14,%r2 | 45 | 1: lgr %r14,%r2 /* r14: Function to call */ |
| 46 | lgr %r2,%r3 /* r2 : Parameter for function*/ | ||
| 47 | basr %r14,%r14 /* Call function */ | ||
| 46 | 48 | ||
| 47 | .section .data,"aw",@progbits | 49 | .section .data,"aw",@progbits |
| 48 | .gprregs: | 50 | .gprregs: |