aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-09-14 17:35:46 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-09-20 13:20:29 +0200
commit4e62d458850069c9f05e03f99be1a817967e201f (patch)
tree36930d2ada8892e0b888c1cddcf9cba830b36c33 /arch/s390/boot
parent26f4414a45b808f83d42d6fd2fbf4a59ef25e84b (diff)
s390: clean up stacks setup
Replace hard coded stack frame overhead values with STACK_FRAME_OVERHEAD definition. Avoid unnecessary arithmetic instructions. 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.S4
-rw-r--r--arch/s390/boot/head.S3
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/s390/boot/compressed/head.S b/arch/s390/boot/compressed/head.S
index df8dbbc17bcc..4041fcfd8980 100644
--- a/arch/s390/boot/compressed/head.S
+++ b/arch/s390/boot/compressed/head.S
@@ -12,6 +12,7 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
#include <asm/page.h>
+#include <asm/ptrace.h>
#include "sizes.h"
__HEAD
@@ -20,7 +21,6 @@ ENTRY(startup_decompressor)
.LPG1:
# setup stack
lg %r15,.Lstack-.LPG1(%r13)
- aghi %r15,-160
brasl %r14,decompress_kernel
# Set up registers for memory mover. We move the decompressed image to
# 0x100000, where startup_continue of the decompressed image is supposed
@@ -45,7 +45,7 @@ mover_end:
.align 8
.Lstack:
- .quad 0x8000 + (1<<(PAGE_SHIFT+THREAD_SIZE_ORDER))
+ .quad 0x8000 + THREAD_SIZE - STACK_FRAME_OVERHEAD
.Loffset:
.quad 0x100000
.Lmvsize:
diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S
index f1cdca8ad3cc..d0736a05bc7f 100644
--- a/arch/s390/boot/head.S
+++ b/arch/s390/boot/head.S
@@ -311,7 +311,6 @@ ENTRY(startup_kdump)
spt 6f-.LPG0(%r13)
mvc __LC_LAST_UPDATE_TIMER(8),6f-.LPG0(%r13)
l %r15,.Lstack-.LPG0(%r13)
- ahi %r15,-STACK_FRAME_OVERHEAD
brasl %r14,verify_facilities
#ifdef CONFIG_KERNEL_UNCOMPRESSED
jg startup_continue
@@ -320,7 +319,7 @@ ENTRY(startup_kdump)
#endif
.Lstack:
- .long 0x8000 + (1<<(PAGE_SHIFT+THREAD_SIZE_ORDER))
+ .long 0x8000 + THREAD_SIZE - STACK_FRAME_OVERHEAD
.align 8
6: .long 0x7fffffff,0xffffffff

Privacy Policy