summaryrefslogtreecommitdiff
path: root/arch/s390/boot/head.S
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-07-19 14:11:28 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-10-09 12:21:02 +0300
commit8f75582a2fb6e2c5afc5252b6d6932f61a79c939 (patch)
treece09a3124eabde2b2e88f03d030f2a54ecbe450a /arch/s390/boot/head.S
parent32ce55a6592fc3e117e70953001a9ea1931f7941 (diff)
downloadlinux-8f75582a2fb6e2c5afc5252b6d6932f61a79c939.tar.xz
s390: remove decompressor's head.S
Decompressor's head.S provided "data mover" sole purpose of which has been to safely move uncompressed kernel at 0x100000 and jump to it. With current bzImage layout entire decompressor's code guaranteed to be in a safe location under 0x100000, and hence could not be overwritten during kernel move. For that reason head.S could be replaced with simple memmove function. To do so introduce early boot code phase which is executed from arch/s390/boot/head.S after "verify_facilities" and takes care of optional kernel image decompression and transition to it. Reviewed-by: Martin Schwidefsky <schwidefsky@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/boot/head.S')
-rw-r--r--arch/s390/boot/head.S6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S
index d0736a05bc7f..e209cfe69bb9 100644
--- a/arch/s390/boot/head.S
+++ b/arch/s390/boot/head.S
@@ -312,11 +312,7 @@ ENTRY(startup_kdump)
mvc __LC_LAST_UPDATE_TIMER(8),6f-.LPG0(%r13)
l %r15,.Lstack-.LPG0(%r13)
brasl %r14,verify_facilities
-#ifdef CONFIG_KERNEL_UNCOMPRESSED
- jg startup_continue
-#else
- jg startup_decompressor
-#endif
+ brasl %r14,startup_kernel
.Lstack:
.long 0x8000 + THREAD_SIZE - STACK_FRAME_OVERHEAD