* [patch 2.6.21-rc4-omap1] omap2/pm.c build fix
@ 2007-03-28 20:16 David Brownell
2007-03-29 20:29 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: David Brownell @ 2007-03-28 20:16 UTC (permalink / raw)
To: linux-omap-open-source
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>
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -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++)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 2.6.21-rc4-omap1] omap2/pm.c build fix
2007-03-28 20:16 [patch 2.6.21-rc4-omap1] omap2/pm.c build fix David Brownell
@ 2007-03-29 20:29 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-03-29 20:29 UTC (permalink / raw)
To: David Brownell; +Cc: linux-omap-open-source
* David Brownell <david-b@pacbell.net> [070328 17:24]:
> 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>
>
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -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++)
Pushing today.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-29 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-28 20:16 [patch 2.6.21-rc4-omap1] omap2/pm.c build fix David Brownell
2007-03-29 20:29 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox