Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-cris / arch-v32 / processor.h

diff --git a/include/asm-cris/arch-v32/processor.h b/include/asm-cris/arch-v32/processor.h
index 8c939bf27987f36a6c89cb3acfe6db6d874f2419..f80b47790ca6e29f5e1e4065a43f5213dfab7fff 100644 (file)
--- a/include/asm-cris/arch-v32/processor.h
+++ b/include/asm-cris/arch-v32/processor.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_CRIS_ARCH_PROCESSOR_H
 #define _ASM_CRIS_ARCH_PROCESSOR_H
 
-#include <linux/config.h>
 
 /* Return current instruction pointer. */
 #define current_text_addr() \
@@ -24,7 +23,7 @@ struct thread_struct {
  * User-space process size. This is hardcoded into a few places, so don't
  * changed it unless everything's clear!
  */
-#ifndef CONFIG_ETRAXFS_SIM
+#ifndef CONFIG_ETRAX_VCS_SIM
 #define TASK_SIZE      (0xB0000000UL)
 #else
 #define TASK_SIZE      (0xA0000000UL)
@@ -36,7 +35,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; \