Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86

[karo-tx-linux.git] / include / asm-ia64 / compat.h

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index aaf11f4e916997643d60c7d45fb4718ac5092363..c0b19106665ca1d45bc0e8e3c20bd76190a981e1 100644 (file)
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
@@ -192,7 +192,7 @@ compat_ptr (compat_uptr_t uptr)
 static __inline__ void __user *
 compat_alloc_user_space (long len)
 {
-       struct pt_regs *regs = ia64_task_regs(current);
+       struct pt_regs *regs = task_pt_regs(current);
        return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
 }