summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-06-27 17:32:53 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-07-02 11:24:59 +0200
commitc949786450d6e19ef21f0837488a3dc1554131d6 (patch)
treef0a488519f9a504335fa48e5c3b866ab73d0a94a /arch/s390/kernel/vmlinux.lds.S
parent183ab05ff285555c56b7f00bb4fd52d80a9513fb (diff)
downloadlinux-c949786450d6e19ef21f0837488a3dc1554131d6.tar.gz
linux-c949786450d6e19ef21f0837488a3dc1554131d6.tar.bz2
linux-c949786450d6e19ef21f0837488a3dc1554131d6.zip
s390: correct _stext offset
Avoid unnecessary rewrite of psw and merge _stext into startup_continue. This allows to move _stext definition to vmlinux.lds.S, where _etext is also defined and set _stext to the actual beginning of .text at 0x100000. This fixes the problem with setting the last .text page as not-executable due to vmem_map_init relying on page alinged _stext and _etext. Fixes: bd79d6632958 ("s390/decompressor: trim the kernel image up to 1M") Reported-by: Nils Hoppmann <niho@de.ibm.com> Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/vmlinux.lds.S')
-rw-r--r--arch/s390/kernel/vmlinux.lds.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 35f7ca8a1685..b3e95b9d99de 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -31,6 +31,7 @@ PHDRS {
SECTIONS
{
. = 0x100000;
+ _stext = .; /* Start of text section */
.text : {
/* Text and read-only data */
HEAD_TEXT