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 'stable/bug-fixes-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
entry64.S
diff --git
a/arch/s390/kernel/entry64.S
b/arch/s390/kernel/entry64.S
index
9d3603d
..
9fd8645
100644
(file)
--- a/
arch/s390/kernel/entry64.S
+++ b/
arch/s390/kernel/entry64.S
@@
-841,7
+841,7
@@
restart_base:
mvc __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)
xc __LC_STEAL_TIMER(8),__LC_STEAL_TIMER
stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on
-
jg
start_secondary
+
brasl %r14,
start_secondary
.align 8
restart_vtime:
.long 0x7fffffff,0xffffffff