Commit:     b652c23cb0f7808bedb5442c416d91705a465c67
Parent:     dc34d312c7b25d5d0f54c16d143a9526936e5d38
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 8 17:46:29 2006 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Tue Dec 12 08:42:08 2006 +0900

    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 <[EMAIL PROTECTED]>
 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 7347f6a..486c06e 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to