Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a890380 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 56e9219a

arch/s390/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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:

arch/s390/include/asm/thread_info.h

+2 −4
Original line number Diff line number Diff line
@@ -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



/*

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/s390/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/s390/kernel/head64.S

+1 −1
Original line number Diff line number Diff line
@@ -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

#