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

Commit 8c1fc5ab authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Rename THREAD_INFO to TASK_STACK 



This patch renames THREAD_INFO to TASK_STACK, because it is in fact
the offset of the pointer to the stack in task_struct so this pointer
will not be impacted by the move of THREAD_INFO.

Also make it available on 64-bit, as we'll need it there when we
activate THREAD_INFO_IN_TASK.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
[mpe: Make available on 64-bit]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 018cce33

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -90,13 +90,13 @@ int main(void) 
	DEFINE(SIGSEGV, SIGSEGV);

	DEFINE(NMI_MASK, NMI_MASK);

#else

	OFFSET(THREAD_INFO, task_struct, stack);

	DEFINE(THREAD_INFO_GAP, _ALIGN_UP(sizeof(struct thread_info), 16));

	OFFSET(KSP_LIMIT, thread_struct, ksp_limit);

#ifdef CONFIG_PPC_RTAS

	OFFSET(RTAS_SP, thread_struct, rtas_sp);

#endif

#endif /* CONFIG_PPC64 */

	OFFSET(TASK_STACK, task_struct, stack);



#ifdef CONFIG_LIVEPATCH

	OFFSET(TI_livepatch_sp, thread_info, livepatch_sp);

arch/powerpc/kernel/entry_32.S

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ ret_from_debug_exc: 
	mfspr	r9,SPRN_SPRG_THREAD

	lwz	r10,SAVED_KSP_LIMIT(r1)

	stw	r10,KSP_LIMIT(r9)

	lwz	r9,THREAD_INFO-THREAD(r9)

	lwz	r9,TASK_STACK-THREAD(r9)

	CURRENT_THREAD_INFO(r10, r1)

	lwz	r10,TI_PREEMPT(r10)

	stw	r10,TI_PREEMPT(r9)

arch/powerpc/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ __secondary_hold_acknowledge: 
	tophys(r11,r1);			/* use tophys(r1) if kernel */ \

	beq	1f;		\

	mfspr	r11,SPRN_SPRG_THREAD;	\

	lwz	r11,THREAD_INFO-THREAD(r11);	\

	lwz	r11,TASK_STACK-THREAD(r11);	\

	addi	r11,r11,THREAD_SIZE;	\

	tophys(r11,r11);	\

1:	subi	r11,r11,INT_FRAME_SIZE	/* alloc exc. frame */

arch/powerpc/kernel/head_40x.S

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ _ENTRY(saved_ksp_limit) 
	andi.	r11,r11,MSR_PR;						     \

	beq	1f;							     \

	mfspr	r1,SPRN_SPRG_THREAD;	/* if from user, start at top of   */\

	lwz	r1,THREAD_INFO-THREAD(r1); /* this thread's kernel stack   */\

	lwz	r1,TASK_STACK-THREAD(r1); /* this thread's kernel stack   */\

	addi	r1,r1,THREAD_SIZE;					     \

1:	subi	r1,r1,INT_FRAME_SIZE;	/* Allocate an exception frame     */\

	tophys(r11,r1);							     \
@@ -158,7 +158,7 @@ _ENTRY(saved_ksp_limit) 
	beq	1f;							     \

	/* COMING FROM USER MODE */					     \

	mfspr	r11,SPRN_SPRG_THREAD;	/* if from user, start at top of   */\

	lwz	r11,THREAD_INFO-THREAD(r11); /* this thread's kernel stack */\

	lwz	r11,TASK_STACK-THREAD(r11); /* this thread's kernel stack */\

1:	addi	r11,r11,THREAD_SIZE-INT_FRAME_SIZE; /* Alloc an excpt frm  */\

	tophys(r11,r11);						     \

	stw	r10,_CCR(r11);          /* save various registers	   */\

arch/powerpc/kernel/head_8xx.S

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ instruction_counter: 
	tophys(r11,r1);			/* use tophys(r1) if kernel */ \

	beq	1f;		\

	mfspr	r11,SPRN_SPRG_THREAD;	\

	lwz	r11,THREAD_INFO-THREAD(r11);	\

	lwz	r11,TASK_STACK-THREAD(r11);	\

	addi	r11,r11,THREAD_SIZE;	\

	tophys(r11,r11);	\

1:	subi	r11,r11,INT_FRAME_SIZE	/* alloc exc. frame */