Merge branch 'linux-2.6'

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index b256cfbef344..698079b3a336 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -70,7 +70,7 @@ int main(void)
         DEFINE(TASK_ACTIVE_MM, offsetof (struct task_struct, active_mm));
         DEFINE(TASK_PID, offsetof (struct task_struct, pid));
         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_STRUCT_SIZE, sizeof (struct task_struct));
         BLANK();