projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for_linus-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
[cascardo/linux.git]
/
arch
/
s390
/
kernel
/
head31.S
diff --git
a/arch/s390/kernel/head31.S
b/arch/s390/kernel/head31.S
index
a1372ae
..
9a99856
100644
(file)
--- a/
arch/s390/kernel/head31.S
+++ b/
arch/s390/kernel/head31.S
@@
-78,10
+78,7
@@
ENTRY(startup_continue)
ENTRY(_ehead)
-#ifdef CONFIG_SHARED_KERNEL
.org 0x100000 - 0x11000 # head.o ends at 0x11000
-#endif
-
#
# startup-code, running in absolute addressing mode
#