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/kernel/setup.c | |
| parent | ce3dc447493ff4186b192b38d723ab5e8c1eb52f (diff) | |
| download | linux-32ce55a6592fc3e117e70953001a9ea1931f7941.tar.gz | |
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/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index eca51c485d09..67fa7cb8ae80 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -308,13 +308,13 @@ unsigned long stack_alloc(void) { #ifdef CONFIG_VMAP_STACK return (unsigned long) - __vmalloc_node_range(STACK_SIZE, STACK_SIZE, + __vmalloc_node_range(THREAD_SIZE, THREAD_SIZE, VMALLOC_START, VMALLOC_END, THREADINFO_GFP, PAGE_KERNEL, 0, NUMA_NO_NODE, __builtin_return_address(0)); #else - return __get_free_pages(GFP_KERNEL, STACK_ORDER); + return __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER); #endif } @@ -323,7 +323,7 @@ void stack_free(unsigned long stack) #ifdef CONFIG_VMAP_STACK vfree((void *) stack); #else - free_pages(stack, STACK_ORDER); + free_pages(stack, THREAD_SIZE_ORDER); #endif } @@ -331,7 +331,7 @@ int __init arch_early_irq_init(void) { unsigned long stack; - stack = __get_free_pages(GFP_KERNEL, STACK_ORDER); + stack = __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER); if (!stack) panic("Couldn't allocate async stack"); S390_lowcore.async_stack = stack + STACK_INIT_OFFSET; @@ -347,7 +347,7 @@ static int __init async_stack_realloc(void) if (!new) panic("Couldn't allocate async stack"); S390_lowcore.async_stack = new + STACK_INIT_OFFSET; - free_pages(old, STACK_ORDER); + free_pages(old, THREAD_SIZE_ORDER); return 0; } early_initcall(async_stack_realloc); @@ -428,7 +428,7 @@ static void __init setup_lowcore(void) * Allocate the global restart stack which is the same for * all CPUs in cast *one* of them does a PSW restart. */ - restart_stack = memblock_virt_alloc(STACK_SIZE, STACK_SIZE); + restart_stack = memblock_virt_alloc(THREAD_SIZE, THREAD_SIZE); restart_stack += STACK_INIT_OFFSET; /* |