[PATCH] cris: fix KSTK_EIP

cris KSTK_EIP looked for pt_regs at the right offset but from the wrong
place - forgotten ->thread_info

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/include/asm-cris/arch-v10/processor.h b/include/asm-cris/arch-v10/processor.h
index e23df8dc96e8..cc692c7a0660 100644
--- a/include/asm-cris/arch-v10/processor.h
+++ b/include/asm-cris/arch-v10/processor.h
@@ -40,7 +40,7 @@ struct thread_struct {
 #define KSTK_EIP(tsk)   \
 ({                      \
         unsigned long eip = 0;   \
-        unsigned long regs = (unsigned long)user_regs(tsk); \
+        unsigned long regs = (unsigned long)task_pt_regs(tsk); \
         if (regs > PAGE_SIZE && \
                 virt_addr_valid(regs)) \
         eip = ((struct pt_regs *)regs)->irp; \
diff --git a/include/asm-cris/arch-v32/processor.h b/include/asm-cris/arch-v32/processor.h
index 8c939bf27987..32bf2e538ced 100644
--- a/include/asm-cris/arch-v32/processor.h
+++ b/include/asm-cris/arch-v32/processor.h
@@ -36,7 +36,7 @@ struct thread_struct {
 #define KSTK_EIP(tsk)           \
 ({                              \
         unsigned long eip = 0;  \
-        unsigned long regs = (unsigned long)user_regs(tsk); \
+        unsigned long regs = (unsigned long)task_pt_regs(tsk); \
         if (regs > PAGE_SIZE && virt_addr_valid(regs))      \
                 eip = ((struct pt_regs *)regs)->erp;        \
         eip; \