diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-09-18 18:23:40 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-10-09 11:20:58 +0200 |
| commit | 32ce55a6592fc3e117e70953001a9ea1931f7941 (patch) | |
| tree | 6f195ca6380a0241a1cbe0853e0ecadc7cccafb6 /arch/s390/include | |
| parent | ce3dc447493ff4186b192b38d723ab5e8c1eb52f (diff) | |
s390: unify stack size definitions
Remove STACK_ORDER and STACK_SIZE in favour of identical THREAD_SIZE_ORDER
and THREAD_SIZE definitions. THREAD_SIZE and THREAD_SIZE_ORDER naming is
misleading since it is used as general kernel stack size information. But
both those definitions are used in the common code and throughout
architectures specific code, so changing the naming is problematic.
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/include')
| -rw-r--r-- | arch/s390/include/asm/processor.h | 8 | ||||
| -rw-r--r-- | arch/s390/include/asm/thread_info.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 3c1e723a143a..43494a014d5b 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -163,14 +163,6 @@ struct thread_struct { typedef struct thread_struct thread_struct; /* - * General size of a stack - */ -#define STACK_ORDER 2 -#define STACK_SIZE (PAGE_SIZE << STACK_ORDER) -#define STACK_INIT_OFFSET \ - (STACK_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs)) - -/* * Stack layout of a C stack frame. */ #ifndef __PACK_STACK diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index 3fa2fea0ba23..1bbbaf6ae511 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h @@ -11,7 +11,7 @@ #include <linux/const.h> /* - * Size of kernel stack for each process + * General size of kernel stacks */ #define THREAD_SIZE_ORDER 2 #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) @@ -21,6 +21,9 @@ #include <asm/page.h> #include <asm/processor.h> +#define STACK_INIT_OFFSET \ + (THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs)) + /* * low level task data that entry.S needs immediate access to * - this struct should fit entirely inside of one cache line |