diff options
| -rw-r--r-- | kernel/futex.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index e149545c5cea..6579912ee70c 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -1253,16 +1253,13 @@ retry: | |||
| 1253 | if (!abs_time) | 1253 | if (!abs_time) |
| 1254 | schedule(); | 1254 | schedule(); |
| 1255 | else { | 1255 | else { |
| 1256 | unsigned long slack; | ||
| 1257 | slack = current->timer_slack_ns; | ||
| 1258 | if (rt_task(current)) | ||
| 1259 | slack = 0; | ||
| 1260 | hrtimer_init_on_stack(&t.timer, | 1256 | hrtimer_init_on_stack(&t.timer, |
| 1261 | clockrt ? CLOCK_REALTIME : | 1257 | clockrt ? CLOCK_REALTIME : |
| 1262 | CLOCK_MONOTONIC, | 1258 | CLOCK_MONOTONIC, |
| 1263 | HRTIMER_MODE_ABS); | 1259 | HRTIMER_MODE_ABS); |
| 1264 | hrtimer_init_sleeper(&t, current); | 1260 | hrtimer_init_sleeper(&t, current); |
| 1265 | hrtimer_set_expires_range_ns(&t.timer, *abs_time, slack); | 1261 | hrtimer_set_expires_range_ns(&t.timer, *abs_time, |
| 1262 | current->timer_slack_ns); | ||
| 1266 | 1263 | ||
| 1267 | hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); | 1264 | hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); |
| 1268 | if (!hrtimer_active(&t.timer)) | 1265 | if (!hrtimer_active(&t.timer)) |