timer fixes

GIT PULL Ingo Molnar 1 participant 1 message Oct 3, 2015

Subsystems (4)

Arm Rockchip Clocksource, clockevent drivers Timekeeping, clocksource core, NTP, alarmtimer Arm/Texas instrument Keystone clocksource

lore

Share & tools

lore

Ingo Molnar

author

2015-10-03 10:20 UTC #0 lore raw

Linus,

Please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

# HEAD: 67dfae0cd72fec5cd158b6e5fb1647b7dbe0834c clocksource: Fix abs() usage w/ 64bit values

An abs64() fix in the watchdog driver, and two clocksource driver NO_IRQ assumption fixes.

Thanks,

Ingo

------------------>
Daniel Lezcano (2):
clocksource/drivers/rockchip: Fix bad NO_IRQ usage clocksource/drivers/keystone: Fix bad NO_IRQ usage

John Stultz (1):
clocksource: Fix abs() usage w/ 64bit values

 drivers/clocksource/rockchip_timer.c | 2 +-
 drivers/clocksource/timer-keystone.c | 2 +-
 kernel/time/clocksource.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

drivers/clocksource/rockchip_timer.c +1 -1

index bb2c2b050964..d3c1742ded1a 100644
@@ -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

index edacf3902e10..1cea08cf603e 100644
@@ -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

index 841b72f720e8..3a38775b50c2 100644
@@ -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",