diff options
| author | Thomas Gleixner | 2015-04-14 23:09:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2015-04-22 17:06:51 +0200 |
| commit | 2e4b0d3fe88bc2618fd5d081ace338a70f8c23da (patch) | |
| tree | a28645356412e14963375b54f49f0bfd3f4531f2 /kernel/futex.c | |
| parent | hrtimer: Remove bogus hrtimer_active() check (diff) | |
| download | kernel-qcow2-linux-2e4b0d3fe88bc2618fd5d081ace338a70f8c23da.tar.gz kernel-qcow2-linux-2e4b0d3fe88bc2618fd5d081ace338a70f8c23da.tar.xz kernel-qcow2-linux-2e4b0d3fe88bc2618fd5d081ace338a70f8c23da.zip | |
futex: Remove bogus hrtimer_active() check
The check for hrtimer_active() after starting the timer is
pointless. If the timer is inactive it has expired already and
therefor the task pointer is already NULL.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20150414203502.985825453@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 2579e407ff67..720eacff6b58 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2063,11 +2063,8 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q, queue_me(q, hb); /* Arm the timer */ - if (timeout) { + if (timeout) hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS); - if (!hrtimer_active(&timeout->timer)) - timeout->task = NULL; - } /* * If we have been removed from the hash list, then another task |