Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / include / asm-ia64 / compat.h

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index c0b19106665ca1d45bc0e8e3c20bd76190a981e1..40d01d80610d0c148019ce77b9f4e37a553a65f8 100644 (file)
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
@@ -189,6 +189,12 @@ compat_ptr (compat_uptr_t uptr)
        return (void __user *) (unsigned long) uptr;
 }
 
+static inline compat_uptr_t
+ptr_to_compat(void __user *uptr)
+{
+       return (u32)(unsigned long)uptr;
+}
+
 static __inline__ void __user *
 compat_alloc_user_space (long len)
 {