diff --git a/[refs] b/[refs] index 4c6e228bb516..f34872771b7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 782a6de47b97d5c5f16c84f7868606fa25781fec +refs/heads/master: 7d61c4596d11d624efb4bbcbad01f9cf2b321162 diff --git a/trunk/include/linux/compat.h b/trunk/include/linux/compat.h index a671dbff7a1f..8fa7857e153b 100644 --- a/trunk/include/linux/compat.h +++ b/trunk/include/linux/compat.h @@ -192,8 +192,8 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp, struct compat_timeval __user *tvp); asmlinkage long compat_sys_wait4(compat_pid_t pid, - compat_uint_t *stat_addr, int options, - struct compat_rusage *ru); + compat_uint_t __user *stat_addr, int options, + struct compat_rusage __user *ru); #define BITS_PER_COMPAT_LONG (8*sizeof(compat_long_t))