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

[linux-2.6-omap-h63xx.git] / arch / xtensa / kernel / entry.S

diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index c64a01f71de6929e12020e75649afd3e18b36f8f..89e409e9e0dedd9cbb51474aa41359ddfb9631c0 100644 (file)
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -14,7 +14,7 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/uaccess.h>
@@ -1102,7 +1102,7 @@ ENTRY(fast_syscall_sysxtensa)
        s32i    a7, a2, PT_AREG7
 
        movi    a7, 4                   # sizeof(unsigned int)
-       verify_area a3, a7, a0, a2, .Leac
+       access_ok a0, a3, a7, a2, .Leac
 
        _beqi   a6, SYSXTENSA_ATOMIC_SET, .Lset
        _beqi   a6, SYSXTENSA_ATOMIC_EXG_ADD, .Lexg