The patch titled
Fix: timeout not passed anymore to futex_lock_pi
has been removed from the -mm tree. Its filename was
sys_futex64-allows-64bit-futexes-fix.patch
This patch was dropped because it was folded into
sys_futex64-allows-64bit-futexes.patch
------------------------------------------------------
Subject: Fix: timeout not passed anymore to futex_lock_pi
From: Pierre Peiffer <[EMAIL PROTECTED]>
This is a fix for a bug introduced by the patch
make-futex_wait-use-an-hrtimer-for-timeout.patch : the timeout value
is not passed anymore to futex_lock_pi.
Signed-off-by: Pierre Peiffer <[EMAIL PROTECTED]>
Cc: Sebastien Dugue <[EMAIL PROTECTED]>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Cc: Ulrich Drepper <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
kernel/futex.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN kernel/futex.c~sys_futex64-allows-64bit-futexes-fix kernel/futex.c
--- a/kernel/futex.c~sys_futex64-allows-64bit-futexes-fix
+++ a/kernel/futex.c
@@ -2383,8 +2383,10 @@ sys_futex64(u64 __user *uaddr, int op, u
return -EFAULT;
if (!timespec_valid(&ts))
return -EINVAL;
+
+ t = timespec_to_ktime(ts);
if (op == FUTEX_WAIT)
- t = ktime_add(ktime_get(), timespec_to_ktime(ts));
+ t = ktime_add(ktime_get(), t);
tp = &t;
}
/*
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
make-futex_wait-use-an-hrtimer-for-timeout-fix-2.patch
sys_futex64-allows-64bit-futexes.patch
sys_futex64-allows-64bit-futexes-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
