From 1cea16e7d9fa38b30db3f9edb3c1ee1e3902cab9 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 28 Mar 2007 13:16:08 -0700 Subject: [PATCH] ARM: OMAP: 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/pm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 27d7f85425b..64e67e55a1a 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++) -- 2.41.1