s390/thread_info: get rid of THREAD_ORDER define

We have the s390 specific THREAD_ORDER define and the THREAD_SIZE_ORDER
define which is also used in common code. Both have exactly the same
semantics. Therefore get rid of THREAD_ORDER and always use
THREAD_SIZE_ORDER instead.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/boot/compressed/head.S b/arch/s390/boot/compressed/head.S
index 28c4f96a2d9cef6d6ce97abc84890cc0c1f65615..11f6254c561e8862f0cd1bfc39dab487ba585229 100644 (file)
--- a/arch/s390/boot/compressed/head.S
+++ b/arch/s390/boot/compressed/head.S
@@ -46,7 +46,7 @@ mover_end:
 
        .align  8
 .Lstack:
-       .quad   0x8000 + (1<<(PAGE_SHIFT+THREAD_ORDER))
+       .quad   0x8000 + (1<<(PAGE_SHIFT+THREAD_SIZE_ORDER))
 .Loffset:
        .quad   0x11000
 .Lmvsize:

diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index 6084706885ab24e4234d3bd614113559aa8c0c21..a5b54a445eb804f55ba57301a0b4ac8280ee96b9 100644 (file)
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -12,10 +12,10 @@
 /*
  * Size of kernel stack for each process
  */
-#define THREAD_ORDER 2
+#define THREAD_SIZE_ORDER 2
 #define ASYNC_ORDER  2
 
-#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
+#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
 #define ASYNC_SIZE  (PAGE_SIZE << ASYNC_ORDER)
 
 #ifndef __ASSEMBLY__
@@ -46,8 +46,6 @@ struct thread_info {
 void arch_release_task_struct(struct task_struct *tsk);
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
 
-#define THREAD_SIZE_ORDER THREAD_ORDER
-
 #endif
 
 /*

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 1cc4578d861faafa0391b0e2ed8951b521080343..9e0291ad11a7c65c89235808f3fca01b2675a898 100644 (file)
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -42,7 +42,7 @@ __PT_R13     =        __PT_GPRS + 104
 __PT_R14     = __PT_GPRS + 112
 __PT_R15     = __PT_GPRS + 120
 
-STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
+STACK_SHIFT = PAGE_SHIFT + THREAD_SIZE_ORDER
 STACK_SIZE  = 1 << STACK_SHIFT
 STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE
 

diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 4431905f8cfa2cbac81ada709929201371669d99..0b5ebf8a3d30f0314ac5c509a80166cbbcbe9e79 100644 (file)
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -315,7 +315,7 @@ ENTRY(startup_kdump)
        jg      startup_continue
 
 .Lstack:
-       .long   0x8000 + (1<<(PAGE_SHIFT+THREAD_ORDER))
+       .long   0x8000 + (1<<(PAGE_SHIFT+THREAD_SIZE_ORDER))
        .align  8
 6:     .long   0x7fffffff,0xffffffff
 

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index a46201d2ed07daec26768437718b5015e5f8bdd5..482d3526e32b290311151a17954f2c55ce41e15b 100644 (file)
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -35,7 +35,7 @@ ENTRY(startup_continue)
        larl    %r14,init_task
        stg     %r14,__LC_CURRENT
        larl    %r15,init_thread_union
-       aghi    %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE
+       aghi    %r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER) # init_task_union + THREAD_SIZE
        stg     %r15,__LC_KERNEL_STACK  # set end of kernel stack
        aghi    %r15,-160
 #

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 285d6561076d2edd780ab788ceccc000cc2c46ea..ef60f4177331f4f1b51a572e9ec2ddf3d805c0a3 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -168,7 +168,7 @@ void do_softirq_own_stack(void)
        old = current_stack_pointer();
        /* Check against async. stack address range. */
        new = S390_lowcore.async_stack;
-       if (((new - old) >> (PAGE_SHIFT + THREAD_ORDER)) != 0) {
+       if (((new - old) >> (PAGE_SHIFT + THREAD_SIZE_ORDER)) != 0) {
                /* Need to switch to the async. stack. */
                new -= STACK_FRAME_OVERHEAD;
                ((struct stack_frame *) new)->back_chain = old;

diff --git a/arch/s390/kernel/swsusp.S b/arch/s390/kernel/swsusp.S
index 2d6b6e81f812c453c7745da36bb7c8ad82d08c54..1ff21f05d7dde556ac55dcc59f5b498667c94dfe 100644 (file)
--- a/arch/s390/kernel/swsusp.S
+++ b/arch/s390/kernel/swsusp.S
@@ -194,7 +194,7 @@ pgm_check_entry:
 
        /* Suspend CPU not available -> panic */
        larl    %r15,init_thread_union
-       ahi     %r15,1<<(PAGE_SHIFT+THREAD_ORDER)
+       ahi     %r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)
        larl    %r2,.Lpanic_string
        larl    %r3,_sclp_print_early
        lghi    %r1,0