From f495f35adb27e25f23c09c9a95ca5cb2209fc3dc Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:05:57 -0800 Subject: [PATCH] --- yaml --- r: 18085 b: refs/heads/master c: 552058239238342dfd2fa8d33a299a162b1a4f05 h: refs/heads/master i: 18083: c81758b728ec6408e3ba7036e0d5eecaedb623f8 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/process.c | 2 +- trunk/arch/arm/kernel/traps.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5382c8e00705..92238b512575 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 815d5ec86eb8d5f57e5e4aa147bd1fb6338c58ac +refs/heads/master: 552058239238342dfd2fa8d33a299a162b1a4f05 diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index 91d107d33c8d..ac6ed955ca0f 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/arch/arm/kernel/process.c @@ -459,7 +459,7 @@ unsigned long get_wchan(struct task_struct *p) if (!p || p == current || p->state == TASK_RUNNING) return 0; - stack_start = (unsigned long)(p->thread_info + 1); + stack_start = (unsigned long)end_of_stack(p); stack_end = ((unsigned long)p->thread_info) + THREAD_SIZE; fp = thread_saved_fp(p); diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index c9fe6f5f7ee3..c1a04ec830d1 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -164,7 +164,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) } 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");