---

yaml --- r: 137597 b: refs/heads/master c: 16f4993 h: refs/heads/master i: 137595: 0269012 v: v3
git-mirror · Mar 12, 2009 · 576c3cd · 576c3cd
1 parent d1b7964
commit 576c3cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb3dc62fc5986e85715041c23dcf3832812be4b
+refs/heads/master: 16f4993f4e9860715918efd4eeac928f8de1218b
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1253,16 +1253,13 @@ static int futex_wait(u32 __user *uaddr, int fshared,
 		if (!abs_time)
 			schedule();
 		else {
-			unsigned long slack;
-			slack = current->timer_slack_ns;
-			if (rt_task(current))
-				slack = 0;
 			hrtimer_init_on_stack(&t.timer,
 					      clockrt ? CLOCK_REALTIME :
 					      CLOCK_MONOTONIC,
 					      HRTIMER_MODE_ABS);
 			hrtimer_init_sleeper(&t, current);
-			hrtimer_set_expires_range_ns(&t.timer, *abs_time, slack);
+			hrtimer_set_expires_range_ns(&t.timer, *abs_time,
+						     current->timer_slack_ns);
 
 			hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
 			if (!hrtimer_active(&t.timer))