Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / include / asm-cris / arch-v10 / processor.h

diff --git a/include/asm-cris/arch-v10/processor.h b/include/asm-cris/arch-v10/processor.h
index e23df8d..cc692c7 100644 (file)
--- 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; \