Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a62f1f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

tick: broadcast-hrtimer: Remove overly clever return value abuse 



The assignment of bc_moved in the conditional construct relies on the
fact that in the case of hrtimer_start() invocation the return value
is always 0. It took me a while to understand it.

We want to get rid of the hrtimer_start() return value. Open code the
logic which makes it readable as well.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarPreeti U Murthy <preeti@linux.vnet.ibm.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
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/20150414203503.404751457@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b193217e

kernel/time/tick-broadcast-hrtimer.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -66,9 +66,11 @@ static int bc_set_next(ktime_t expires, struct clock_event_device *bc) 
	 * hrtimer_{start/cancel} functions call into tracing,

	 * hrtimer_{start/cancel} functions call into tracing,

	 * calls to these functions must be bound within RCU_NONIDLE.

	 * calls to these functions must be bound within RCU_NONIDLE.

	 */

	 */

	RCU_NONIDLE(bc_moved = (hrtimer_try_to_cancel(&bctimer) >= 0) ?

	RCU_NONIDLE({

		!hrtimer_start(&bctimer, expires, HRTIMER_MODE_ABS_PINNED) :

			bc_moved = hrtimer_try_to_cancel(&bctimer) >= 0;

			0);

			if (bc_moved)

				hrtimer_start(&bctimer, expires,

					      HRTIMER_MODE_ABS_PINNED);});

	if (bc_moved) {

	if (bc_moved) {

		/* Bind the "device" to the cpu */

		/* Bind the "device" to the cpu */

		bc->bound_on = smp_processor_id();

		bc->bound_on = smp_processor_id();