summaryrefslogtreecommitdiff
path: root/arch/s390/include
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2022-05-30 14:09:24 +0200
committerHeiko Carstens <hca@linux.ibm.com>2022-06-01 12:03:17 +0200
commitf037acb41dc9fc0f00521685b3250226d6f9b437 (patch)
tree64a6dca535df5bef82081c0620eeb91e3cffcad7 /arch/s390/include
parentd144182ed19af0bed4e4a73b51c7af9caccf6fa2 (diff)
s390/stack: merge empty stack frame slots
Merge empty1 and empty2 arrays within the stack frame to one single array. This is possible since with commit 42b01a553a56 ("s390: always use the packed stack layout") the alternative stack frame layout is gone. Reviewed-by: Nico Boehr <nrb@linux.ibm.com> Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/stacktrace.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/include/asm/stacktrace.h b/arch/s390/include/asm/stacktrace.h
index f8500191993d..7e0e15bee18d 100644
--- a/arch/s390/include/asm/stacktrace.h
+++ b/arch/s390/include/asm/stacktrace.h
@@ -39,8 +39,7 @@ static inline bool on_stack(struct stack_info *info,
* Kernel uses the packed stack layout (-mpacked-stack).
*/
struct stack_frame {
- unsigned long empty1[5];
- unsigned int empty2[8];
+ unsigned long empty[9];
unsigned long gprs[10];
unsigned long back_chain;
};