Messages in this thread Patch in this message | | | Date | Wed, 22 Apr 2015 12:12:26 -0700 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:timers/core] hrtimer: Remove bogus hrtimer_active() check |
| |
Commit-ID: 3f7b349ac14885472a19c46840235114e5ad5e52 Gitweb: http://git.kernel.org/tip/3f7b349ac14885472a19c46840235114e5ad5e52 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 14 Apr 2015 21:09:11 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Wed, 22 Apr 2015 17:06:51 +0200
hrtimer: 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.907149271@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/time/hrtimer.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index e5cf71aa..c38f0b6 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1361,8 +1361,6 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t->timer, mode); - if (!hrtimer_active(&t->timer)) - t->task = NULL; if (likely(t->task)) freezable_schedule(); @@ -1633,8 +1631,6 @@ schedule_hrtimeout_range_clock(ktime_t *expires, unsigned long delta, hrtimer_init_sleeper(&t, current); hrtimer_start_expires(&t.timer, mode); - if (!hrtimer_active(&t.timer)) - t.task = NULL; if (likely(t.task)) schedule();
| |