diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-06-13 06:25:36 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-06-25 10:14:38 +0200 |
| commit | a5802353b1ee8e4c97e5c255bed7651b924098fa (patch) | |
| tree | 686bc89f2594228ba870c3854d122556ecfee8e4 /arch/s390/boot | |
| parent | 8282cd64d0f9a5292e9f8408a96733523e7f1fec (diff) | |
s390/decompressor: rename entry point to startup_decompressor
Rename the decompressor entry point to startup_decompressor to
avoid confusion, leaving startup_continue as the entry point of the
uncompressed image.
Also remove obsolete comment, as the decompressor code is
unconditionally called from boot/head.S now.
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/boot')
| -rw-r--r-- | arch/s390/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/s390/boot/head.S | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/s390/boot/compressed/head.S b/arch/s390/boot/compressed/head.S index 1c69907dba28..df8dbbc17bcc 100644 --- a/arch/s390/boot/compressed/head.S +++ b/arch/s390/boot/compressed/head.S @@ -15,7 +15,7 @@ #include "sizes.h" __HEAD -ENTRY(startup_continue) +ENTRY(startup_decompressor) basr %r13,0 # get base .LPG1: # setup stack diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S index 5c42f16a54c4..8d98463ca7d0 100644 --- a/arch/s390/boot/head.S +++ b/arch/s390/boot/head.S @@ -310,10 +310,7 @@ ENTRY(startup_kdump) l %r15,.Lstack-.LPG0(%r13) ahi %r15,-STACK_FRAME_OVERHEAD brasl %r14,verify_facilities -# For uncompressed images, continue in -# arch/s390/kernel/head64.S. For compressed images, continue in -# arch/s390/boot/compressed/head.S. - jg startup_continue + jg startup_decompressor .Lstack: .long 0x8000 + (1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)) |