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

Commit 32d39a93 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] arm: task_stack_page() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 55205823

arch/arm/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ unsigned long get_wchan(struct task_struct *p) 
		return 0;



	stack_start = (unsigned long)end_of_stack(p);

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

	stack_end = (unsigned long)task_stack_page(p) + THREAD_SIZE;



	fp = thread_saved_fp(p);

	do {

arch/arm/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int __cpuinit __cpu_up(unsigned int cpu) 
	 * We need to tell the secondary core where to find

	 * its stack and the page tables.

	 */

	secondary_data.stack = (void *)idle->thread_info + THREAD_START_SP;

	secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;

	secondary_data.pgdir = virt_to_phys(pgd);

	wmb();
@@ -245,7 +245,7 @@ void __cpuexit cpu_die(void) 
	__asm__("mov	sp, %0\n"

	"	b	secondary_start_kernel"

		:

		: "r" ((void *)current->thread_info + THREAD_SIZE - 8));

		: "r" (task_stack_page(current) + THREAD_SIZE - 8));

}

#endif /* CONFIG_HOTPLUG_CPU */

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p 


	if (!user_mode(regs) || in_interrupt()) {

		dump_mem("Stack: ", regs->ARM_sp,

			 THREAD_SIZE + (unsigned long)tsk->thread_info);

			 THREAD_SIZE + (unsigned long)task_stack_page(tsk));

		dump_backtrace(regs, tsk);

		dump_instr(regs);

	}

include/asm-arm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ unsigned long get_wchan(struct task_struct *p); 
extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);



#define task_pt_regs(p) \

	((struct pt_regs *)(THREAD_START_SP + (void *)(p)->thread_info) - 1)

	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)



#define KSTK_EIP(tsk)	task_pt_regs(tsk)->ARM_pc

#define KSTK_ESP(tsk)	task_pt_regs(tsk)->ARM_sp