git.samba.org
/
sfrench
/
cifs-2.6.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://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
kernel
/
head64.S
diff --git
a/arch/s390/kernel/head64.S
b/arch/s390/kernel/head64.S
index 172002da70754eb31d3d512f75db46e304fc1eb7..38a973ccf50108b423683496ee4daa28ab2382d6 100644
(file)
--- a/
arch/s390/kernel/head64.S
+++ b/
arch/s390/kernel/head64.S
@@
-28,7
+28,7
@@
ENTRY(startup_continue)
lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers
lg %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area
# move IPL device to lowcore
- l
ghi %r0,__LC_PASTE
+ l
arl %r0,boot_vdso_data
stg %r0,__LC_VDSO_PER_CPU
#
# Setup stack