patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / m68k / kernel / process.c

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index a270b5f..552bd2f 100644 (file)
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -67,8 +67,7 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 {
        struct switch_stack *sw = (struct switch_stack *)tsk->thread.ksp;
        /* Check whether the thread is blocked in resume() */
-       if (sw->retpc > (unsigned long)scheduling_functions_start_here &&
-           sw->retpc < (unsigned long)scheduling_functions_end_here)
+       if (in_sched_functions(sw->retpc))
                return ((unsigned long *)sw->a6)[1];
        else
                return sw->retpc;
@@ -382,12 +381,6 @@ out:
        return error;
 }
 
-/*
- * These bracket the sleeping functions..
- */
-#define first_sched    ((unsigned long) scheduling_functions_start_here)
-#define last_sched     ((unsigned long) scheduling_functions_end_here)
-
 unsigned long get_wchan(struct task_struct *p)
 {
        unsigned long fp, pc;
@@ -403,7 +396,7 @@ unsigned long get_wchan(struct task_struct *p)
                    fp >= 8184+stack_page)
                        return 0;
                pc = ((unsigned long *)fp)[1];
-               if (pc < first_sched || pc >= last_sched)
+               if (!in_sched_functions(pc))
                        return pc;
                fp = *(unsigned long *) fp;
        } while (count++ < 16);