diff --git a/[refs] b/[refs] index cbef32da6840..efcdf039813a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22a9835c350782a5c3257343713932af3ac92ee0 +refs/heads/master: 66e863acd7f2fb02fef709d5f0ab069445d4a58c diff --git a/trunk/include/asm-ia64/compat.h b/trunk/include/asm-ia64/compat.h index c0b19106665c..40d01d80610d 100644 --- a/trunk/include/asm-ia64/compat.h +++ b/trunk/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) {