Commit-ID: 1ff99ea65687d921cb71f330491ec4205c00eb9f Gitweb: http://git.kernel.org/tip/1ff99ea65687d921cb71f330491ec4205c00eb9f Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> AuthorDate: Thu, 18 Jul 2013 16:59:30 -0700 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitDate: Thu, 1 Aug 2013 01:13:36 +0200 clocksource: arch_timer: Pass clock event to set_mode callback There isn't any reason why we don't pass the event here and we'll need it in the near future for memory mapped arch timers anyway. Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Marc Zyngier <Marc.Zyngier@xxxxxxx> Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Acked-by: Mark Rutland <mark.rutland@xxxxxxx> --- drivers/clocksource/arm_arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index aa07038..7624ba5 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -140,7 +140,7 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk) clk->cpumask = cpumask_of(smp_processor_id()); - clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, NULL); + clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, clk); clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|