arm26: task_stack_page()
PATCH 37/50 arm26: task_stack_page()
References: <[email protected]>
In-Reply-To: <[email protected]>
Signed-off-by Al Viro <[email protected]>
---
arch/arm26/kernel/traps.c | 8 ++++---- include/asm-arm26/thread_info.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
bab19fadfa4a61c4ee18235e025af2d2514ca86d
arch/arm26/kernel/traps.c +4 -4
@@ -132,7 +132,7 @@ static void dump_instr(struct pt_regs *r/*static*/ void __dump_stack (struct task_struct *tsk,unsigned long sp) { -dump_mem ("Stack: " , sp,8192 +(unsigned long )tsk->thread_info); +dump_mem ("Stack: " , sp,8192 +(unsigned long )task_stack_page (tsk)); }void dump_stack (void )
@@ -158,7 +158,7 @@ void dump_backtrace(struct pt_regs *regs }else if (verify_stack (fp)) {printk ("invalid frame pointer 0x%08x" , fp); ok =0 ; - }else if (fp < (unsigned long )(tsk->thread_info +1 )) + }else if (fp < (unsigned long )end_of_stack (tsk))printk ("frame pointer underflow" );printk ("\n" );
@@ -168,7 +168,7 @@ void dump_backtrace(struct pt_regs *regs/* FIXME - this is probably wrong.. */ void show_stack (struct task_struct *task,unsigned long *sp) { -dump_mem ("Stack: " , (unsigned long )sp,8192 +(unsigned long )task->thread_info); +dump_mem ("Stack: " , (unsigned long )sp,8192 +(unsigned long )task_stack_page (task)); }DEFINE_SPINLOCK (die_lock);
@@ -187,7 +187,7 @@ NORET_TYPE void die(const char *str, strprintk ("CPU: %d\n" ,smp_processor_id ());show_regs (regs);printk ("Process %s (pid: %d, stack limit = 0x%p)\n" , - current->comm, current->pid, tsk->thread_info +1 ); + current->comm, current->pid,end_of_stack (tsk));if (!user_mode (regs) ||in_interrupt ()) {__dump_stack (tsk, (unsigned long )(regs +1 ));
include/asm-arm26/thread_info.h +1 -1
@@ -82,7 +82,7 @@ static inline struct thread_info *curren/* FIXME - PAGE_SIZE < 32K */ #define THREAD_SIZE (8*32768) // FIXME - this needs attention (see kernel/fork.c which gets a nice div by zero if this is lower than 8*32768 -#define task_pt_regs (task) ((struct pt_regs *)((unsigned long)(task)->thread_info + THREAD_SIZE - 8) - 1) +#define task_pt_regs (task) ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE - 8) - 1)extern struct thread_info *alloc_thread_info (struct task_struct *task);extern void free_thread_info (struct thread_info *);
Signature · 1 line
0.99.9.GIT