Skip to contentSkip to conversation

omap2/pm.c build fix

PATCH In review David Brownell 2 participants 2 messages Mar 28, 2007 – Mar 29, 2007

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support
lore
Share & tools
lore

David Brownell

author
#0 lore raw

PATCH 1/1 omap2/pm.c build fix

Fix build bug ... next_timer_interrupt() depends on NO_IDLE_HZ or else (new style) NO_HZ, so don't assume it's always present.

Signed-off-by David Brownell <[email protected]>
arch/arm/mach-omap2/pm.c +4 -0
@@ -389,8 +389,12 @@ #endif
 	}
 
 	if (!resume)
+#if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ)
 		printk("--- Going to %s %s (next timer after %u ms)\n", s1, s2,
 		       jiffies_to_msecs(next_timer_interrupt() - jiffies));
+#else
+		printk("--- Going to %s %s\n", s1, s2);
+#endif
 	else
 		printk("--- Woke up (slept for %u.%03u ms)\n", us / 1000, us % 1000);
 	for (i = 0; i < reg_count; i++)
maintainer
#1 lore raw
Quoted 10 lines · David Brownell

Fix build bug ... next_timer_interrupt() depends on NO_IDLE_HZ or else (new style) NO_HZ, so don't assume it's always present.

Signed-off-by David Brownell <[email protected]>
arch/arm/mach-omap2/pm.c +0 -0
@@ -389,8 +389,12 @@ #endif
 	}

arch/arm/mach-omap2/pm.c #endif · line 400

Quoted 10 lines
arch/arm/mach-omap2/pm.c +4 -0
 	if (!resume)
+#if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ)
 		printk("--- Going to %s %s (next timer after %u ms)\n", s1, s2,
 		       jiffies_to_msecs(next_timer_interrupt() - jiffies));
+#else
+		printk("--- Going to %s %s\n", s1, s2);
+#endif
 	else
 		printk("--- Woke up (slept for %u.%03u ms)\n", us / 1000, us % 1000);
 	for (i = 0; i < reg_count; i++)

Pushing today.

Tony