| Date | Wed, 22 Apr 2015 12:12:43 -0700 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:timers/core] futex: Remove bogus hrtimer_active() check |
| |
Commit-ID: 2e4b0d3fe88bc2618fd5d081ace338a70f8c23da Gitweb: http://git.kernel.org/tip/2e4b0d3fe88bc2618fd5d081ace338a70f8c23da Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 14 Apr 2015 21:09:13 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Wed, 22 Apr 2015 17:06:51 +0200
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> --- kernel/futex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c index 2579e40..720eacf 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
|