From 3841c478f2766459d5de29d84babea290b2a2ae6 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 5 Aug 2006 12:15:15 -0700 Subject: [PATCH] --- yaml --- r: 33257 b: refs/heads/master c: ce2c6b53847afc444c4d0a7a1075c61f499c57a5 h: refs/heads/master i: 33255: 1043504716ec256a6faf8372f5caf9cf42d5a9c5 v: v3 --- [refs] | 2 +- trunk/kernel/futex_compat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dd3be925e5d9..d8ed7bb30062 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b8de5f50e4a302b83ebcd5b0120621336d50bd6 +refs/heads/master: ce2c6b53847afc444c4d0a7a1075c61f499c57a5 diff --git a/trunk/kernel/futex_compat.c b/trunk/kernel/futex_compat.c index d1aab1a452cc..c5cca3f65cb7 100644 --- a/trunk/kernel/futex_compat.c +++ b/trunk/kernel/futex_compat.c @@ -39,7 +39,7 @@ void compat_exit_robust_list(struct task_struct *curr) { struct compat_robust_list_head __user *head = curr->compat_robust_list; struct robust_list __user *entry, *pending; - unsigned int limit = ROBUST_LIST_LIMIT, pi; + unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; compat_uptr_t uentry, upending; compat_long_t futex_offset; @@ -59,10 +59,10 @@ void compat_exit_robust_list(struct task_struct *curr) * if it exists: */ if (fetch_robust_entry(&upending, &pending, - &head->list_op_pending, &pi)) + &head->list_op_pending, &pip)) return; if (upending) - handle_futex_death((void *)pending + futex_offset, curr, pi); + handle_futex_death((void *)pending + futex_offset, curr, pip); while (compat_ptr(uentry) != &head->list) { /*