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 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[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 1f70970de0aa2b0fae5f0c428475e21e82d73100..cdef68717416cedce7b46d41599bde1f2be9821c 100644
(file)
--- a/
arch/s390/kernel/head64.S
+++ b/
arch/s390/kernel/head64.S
@@
-80,7
+80,7
@@
startup_continue:
_ehead:
#ifdef CONFIG_SHARED_KERNEL
- .org 0x100000
+ .org 0x100000
- 0x11000 # head.o ends at 0x11000
#endif
#