Commit 3f7b349a authored Apr 14, 2015 by Thomas Gleixner

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>

parent 02a171af

kernel/time/hrtimer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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();