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

Commit 37cc7ab1 authored Oct 03, 2015 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:
 "An abs64() fix in the watchdog driver, and two clocksource driver
  NO_IRQ assumption fixes"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Fix abs() usage w/ 64bit values
  clocksource/drivers/keystone: Fix bad NO_IRQ usage
  clocksource/drivers/rockchip: Fix bad NO_IRQ usage

parents a758379b 67dfae0c

drivers/clocksource/rockchip_timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static void __init rk_timer_init(struct device_node *np)
		bc_timer.freq = clk_get_rate(timer_clk);

		irq = irq_of_parse_and_map(np, 0);
		if (irq == NO_IRQ) {
		if (!irq) {
		pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME);
		return;
		}

drivers/clocksource/timer-keystone.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ static void __init keystone_timer_init(struct device_node *np)
		int irq, error;

		irq = irq_of_parse_and_map(np, 0);
		if (irq == NO_IRQ) {
		if (!irq) {
		pr_err("%s: failed to map interrupts\n", __func__);
		return;
		}

kernel/time/clocksource.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ static void clocksource_watchdog(unsigned long data)
		continue;

		/* Check the deviation from the watchdog clocksource. */
		if ((abs(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD)) {
		if (abs64(cs_nsec - wd_nsec) > WATCHDOG_THRESHOLD) {
		pr_warn("timekeeping watchdog: Marking clocksource '%s' as unstable because the skew is too large:\n",
		cs->name);
		pr_warn(" '%s' wd_now: %llx wd_last: %llx mask: %llx\n",