diff --git a/[refs] b/[refs] index bab9df5f2a09..1525ddc9bef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dce07f1a441b77a15631cf0ed0238e0baa7ed64 +refs/heads/master: 8481664d373e7e2cea3ea0c2d7a06c9e939b19ee diff --git a/trunk/kernel/futex_compat.c b/trunk/kernel/futex_compat.c index ff90f049f8f6..04ac3a9e42cf 100644 --- a/trunk/kernel/futex_compat.c +++ b/trunk/kernel/futex_compat.c @@ -30,7 +30,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry, return 0; } -static void __user *futex_uaddr(struct robust_list *entry, +static void __user *futex_uaddr(struct robust_list __user *entry, compat_long_t futex_offset) { compat_uptr_t base = ptr_to_compat(entry);