diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2010-05-12 11:32:13 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-05-12 11:32:26 +0400 |
| commit | 57d84906f0f3005d4d22e13a3f5102a16a7fc4a2 (patch) | |
| tree | dd679b37b7112c5dc8de3aa60c900533f4ea7376 | |
| parent | 545c174d1f093a462b4bb9131b23d5ea72a600e1 (diff) | |
| download | linux-57d84906f0f3005d4d22e13a3f5102a16a7fc4a2.tar.xz | |
[S390] correct address of _stext with CONFIG_SHARED_KERNEL=y
As of git commit 1844c9bc0b2fed3023551c1affe033ab38e90b9a head64.S/head31.S
are not included in head.S anymore but build as an extra object. This breaks
shared kernel support because the .org statement in head64.S/head31.S for
CONFIG_SHARED_KERNEL=y will have a different effect. The end address of the
head.text section in head.o will be added to the .org value, to compensate
for this subtract 0x11000 to get the required value of 0x100000 again.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/head31.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S index 1bbcc499d455..b8f8dc126102 100644 --- a/arch/s390/kernel/head31.S +++ b/arch/s390/kernel/head31.S @@ -82,7 +82,7 @@ startup_continue: _ehead: #ifdef CONFIG_SHARED_KERNEL - .org 0x100000 + .org 0x100000 - 0x11000 # head.o ends at 0x11000 #endif # diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 1f70970de0aa..cdef68717416 100644 --- 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 # |