[PATCH 81/90] ARM: OMAP: omap2/pm.c build fix

Tony Lindgren
2007-04-04T18:14:32Z

From: David Brownell <david-b@pacbell.net>

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 <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/pm.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 27d7f85..64e67e5 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -389,8 +389,12 @@ static void omap2_pm_dump(int mode, int resume, unsigned int us)
}

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++)
--
1.4.4.2