git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[sfrench/cifs-2.6.git]
/
arch
/
m68knommu
/
kernel
/
process.c
diff --git
a/arch/m68knommu/kernel/process.c
b/arch/m68knommu/kernel/process.c
index 941955dc3b7c5bab8e8c42ee492db86891faff96..846f97534685cfb9a529486d3a4a6d37c3f5aeee 100644
(file)
--- a/
arch/m68knommu/kernel/process.c
+++ b/
arch/m68knommu/kernel/process.c
@@
-377,7
+377,7
@@
unsigned long get_wchan(struct task_struct *p)
fp = ((struct switch_stack *)p->thread.ksp)->a6;
do {
if (fp < stack_page+sizeof(struct thread_info) ||
- fp >=
8184
+stack_page)
+ fp >=
THREAD_SIZE-8
+stack_page)
return 0;
pc = ((unsigned long *)fp)[1];
if (!in_sched_functions(pc))