Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / v850 / kernel / asm-offsets.c

diff --git a/arch/v850/kernel/asm-offsets.c b/arch/v850/kernel/asm-offsets.c
index 24f291369070dc7511f011b10c813f337b8b7b7b..581e6986a7767cc994b1a09e9a7f529a2c25ad01 100644 (file)
--- a/arch/v850/kernel/asm-offsets.c
+++ b/arch/v850/kernel/asm-offsets.c
@@ -13,14 +13,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
+
 #include <asm/irq.h>
 #include <asm/errno.h>
 
-#define DEFINE(sym, val) \
-       asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main (void)
 {
        /* offsets into the task struct */
@@ -29,7 +26,7 @@ int main (void)
        DEFINE (TASK_PTRACE, offsetof (struct task_struct, ptrace));
        DEFINE (TASK_BLOCKED, offsetof (struct task_struct, blocked));
        DEFINE (TASK_THREAD, offsetof (struct task_struct, thread));
-       DEFINE (TASK_THREAD_INFO, offsetof (struct task_struct, thread_info));
+       DEFINE (TASK_THREAD_INFO, offsetof (struct task_struct, stack));
        DEFINE (TASK_MM, offsetof (struct task_struct, mm));
        DEFINE (TASK_ACTIVE_MM, offsetof (struct task_struct, active_mm));
        DEFINE (TASK_PID, offsetof (struct task_struct, pid));