diff --git a/[refs] b/[refs] index efcdf039813a..264df2af2bfb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66e863acd7f2fb02fef709d5f0ab069445d4a58c +refs/heads/master: f267fa9f5b377b5cecdb2baf332fec08bb71246d diff --git a/trunk/include/asm-s390/compat.h b/trunk/include/asm-s390/compat.h index a007715f4aea..356a0b183539 100644 --- a/trunk/include/asm-s390/compat.h +++ b/trunk/include/asm-s390/compat.h @@ -128,6 +128,11 @@ static inline void __user *compat_ptr(compat_uptr_t uptr) return (void __user *)(unsigned long)(uptr & 0x7fffffffUL); } +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) { unsigned long stack;