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

Commit f9ae39d0 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Thomas Gleixner
Browse files

tick: Pass broadcast device to tick_broadcast_set_event() 



Pass the broadcast timer to tick_broadcast_set_event() instead of
reevaluating tick_broadcast_device.evtdev.

[ tglx: Massaged changelog ]

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: viresh.kumar@linaro.org
Cc: jacob.jun.pan@linux.intel.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: santosh.shilimkar@ti.com
Cc: linaro-kernel@lists.linaro.org
Cc: patches@linaro.org
Cc: rickard.andersson@stericsson.com
Cc: vincent.guittot@linaro.org
Cc: linus.walleij@stericsson.com
Cc: john.stultz@linaro.org
Link: http://lkml.kernel.org/r/1362219013-18173-2-git-send-email-daniel.lezcano@linaro.org


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

kernel/time/tick-broadcast.c

+5 −6
Original line number Diff line number Diff line
@@ -401,10 +401,9 @@ struct cpumask *tick_get_broadcast_oneshot_mask(void) 
	return tick_broadcast_oneshot_mask;

}



static int tick_broadcast_set_event(ktime_t expires, int force)

static int tick_broadcast_set_event(struct clock_event_device *bc,

				    ktime_t expires, int force)

{

	struct clock_event_device *bc = tick_broadcast_device.evtdev;



	if (bc->mode != CLOCK_EVT_MODE_ONESHOT)

		clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
@@ -474,7 +473,7 @@ again: 
		 * Rearm the broadcast device. If event expired,

		 * repeat the above

		 */

		if (tick_broadcast_set_event(next_event, 0))

		if (tick_broadcast_set_event(dev, next_event, 0))

			goto again;

	}

	raw_spin_unlock(&tick_broadcast_lock);
@@ -516,7 +515,7 @@ void tick_broadcast_oneshot_control(unsigned long reason) 
		if (!cpumask_test_and_set_cpu(cpu, tick_broadcast_oneshot_mask)) {

			clockevents_set_mode(dev, CLOCK_EVT_MODE_SHUTDOWN);

			if (dev->next_event.tv64 < bc->next_event.tv64)

				tick_broadcast_set_event(dev->next_event, 1);

				tick_broadcast_set_event(bc, dev->next_event, 1);

		}

	} else {

		if (cpumask_test_and_clear_cpu(cpu, tick_broadcast_oneshot_mask)) {
@@ -582,7 +581,7 @@ void tick_broadcast_setup_oneshot(struct clock_event_device *bc) 
			clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);

			tick_broadcast_init_next_event(tmpmask,

						       tick_next_period);

			tick_broadcast_set_event(tick_next_period, 1);

			tick_broadcast_set_event(bc, tick_next_period, 1);

		} else

			bc->next_event.tv64 = KTIME_MAX;

	} else {