git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
entry.S
diff --git
a/arch/s390/kernel/entry.S
b/arch/s390/kernel/entry.S
index
648f642
..
1b67fc6
100644
(file)
--- a/
arch/s390/kernel/entry.S
+++ b/
arch/s390/kernel/entry.S
@@
-836,7
+836,7
@@
restart_base:
stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on
basr %r14,0
l %r14,restart_addr-.(%r14)
- b
r %r14
# branch to start_secondary
+ b
asr %r14,%r14
# branch to start_secondary
restart_addr:
.long start_secondary
.align 8