diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2006-12-08 17:46:29 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-12 08:42:08 +0900 |
| commit | b652c23cb0f7808bedb5442c416d91705a465c67 (patch) | |
| tree | d18dbf1fd11c5ad08e7dc1ef2cb97a774bb92d45 | |
| parent | sh: BUG() handling through trapa vector. (diff) | |
| download | linux-dev-b652c23cb0f7808bedb5442c416d91705a465c67.tar.xz linux-dev-b652c23cb0f7808bedb5442c416d91705a465c67.zip | |
sh: Fix get_wchan().
Some time ago the schedule frame size changed and we failed to reflect
this in get_wchan() at the time. This first popped up as a problem on
SH7751R where schedule_frame ended up being unaligned and generating
an unaligned trap. This fixes it up again..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/process.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 7347f6afa030..486c06e18033 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -470,9 +470,10 @@ unsigned long get_wchan(struct task_struct *p) */ pc = thread_saved_pc(p); if (in_sched_functions(pc)) { - schedule_frame = ((unsigned long *)(long)p->thread.sp)[1]; - return (unsigned long)((unsigned long *)schedule_frame)[1]; + schedule_frame = (unsigned long)p->thread.sp; + return ((unsigned long *)schedule_frame)[21]; } + return pc; } |