Skip to content

Commit

Permalink
[PATCH] futex: Apply recent futex fixes to futex_compat
Browse files Browse the repository at this point in the history
The recent fixups in futex.c need to be applied to futex_compat.c too.  Fixes
a hang reported by Olaf.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Aug 6, 2006
1 parent 2b8de5f commit ce2c6b5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/futex_compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
/*
Expand Down

0 comments on commit ce2c6b5

Please sign in to comment.