git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[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
..
b426ab5
100644
(file)
--- a/
arch/m68k/kernel/process.c
+++ b/
arch/m68k/kernel/process.c
@@
-26,6
+26,7
@@
#include <linux/a.out.h>
#include <linux/reboot.h>
#include <linux/init_task.h>
#include <linux/a.out.h>
#include <linux/reboot.h>
#include <linux/init_task.h>
+#include <linux/mqueue.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@
-67,8
+68,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() */
{
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;
return ((unsigned long *)sw->a6)[1];
else
return sw->retpc;
@@
-382,12
+382,6
@@
out:
return error;
}
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;
unsigned long get_wchan(struct task_struct *p)
{
unsigned long fp, pc;
@@
-403,7
+397,7
@@
unsigned long get_wchan(struct task_struct *p)
fp >= 8184+stack_page)
return 0;
pc = ((unsigned long *)fp)[1];
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);
return pc;
fp = *(unsigned long *) fp;
} while (count++ < 16);