Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[cascardo/linux.git] / arch / m68knommu / kernel / process.c

diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 941955d..47502d5 100644 (file)
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
+#include <linux/fs.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -377,7 +378,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))