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

Commit c9f4f06d authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

wrap access to thread_info 



Recently a few direct accesses to the thread_info in the task structure snuck
back, so this wraps them with the appropriate wrapper.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e61a1c1c

arch/avr32/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -330,13 +330,13 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
{

	struct pt_regs *childregs;



	childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long)p->thread_info)) - 1;

	childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long)task_stack_page(p))) - 1;

	*childregs = *regs;



	if (user_mode(regs))

		childregs->sp = usp;

	else

		childregs->sp = (unsigned long)p->thread_info + THREAD_SIZE;

		childregs->sp = (unsigned long)task_stack_page(p) + THREAD_SIZE;



	childregs->r12 = 0; /* Set return value for child */
@@ -403,7 +403,7 @@ unsigned long get_wchan(struct task_struct *p) 
	if (!p || p == current || p->state == TASK_RUNNING)

		return 0;



	stack_page = (unsigned long)p->thread_info;

	stack_page = (unsigned long)task_stack_page(p);

	BUG_ON(!stack_page);



	/*

arch/avr32/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


static struct pt_regs *get_user_regs(struct task_struct *tsk)

{

	return (struct pt_regs *)((unsigned long) tsk->thread_info +

	return (struct pt_regs *)((unsigned long)task_stack_page(tsk) +

				  THREAD_SIZE - sizeof(struct pt_regs));

}

arch/blackfin/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int main(void) 
	DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));

	DEFINE(TASK_BLOCKED, offsetof(struct task_struct, blocked));

	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));

	DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, thread_info));

	DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));

	DEFINE(TASK_MM, offsetof(struct task_struct, mm));

	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));

	DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, pending));

arch/i386/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ void show_registers(struct pt_regs *regs) 
	       regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);

	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",

		TASK_COMM_LEN, current->comm, current->pid,

		current_thread_info(), current, current->thread_info);

		current_thread_info(), current, task_thread_info(current));

	/*

	 * When in-kernel, we also print out the stack and code at the

	 * time of the fault..

arch/m68knommu/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int main(void) 
	DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));

	DEFINE(TASK_BLOCKED, offsetof(struct task_struct, blocked));

	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));

	DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, thread_info));

	DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));

	DEFINE(TASK_MM, offsetof(struct task_struct, mm));

	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));