From mboxrd@z Thu Jan 1 00:00:00 1970 From: Romit Dasgupta Subject: Re: [PM-WIP-OPP][PATCH] pm: omap3: fix build error for PM disabled Date: Fri, 15 Jan 2010 18:53:22 +0530 Message-ID: <4B506C4A.8080406@ti.com> References: <1263561186-12994-1-git-send-email-nm@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from arroyo.ext.ti.com ([192.94.94.40]:45620 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751580Ab0AONXb (ORCPT ); Fri, 15 Jan 2010 08:23:31 -0500 In-Reply-To: <1263561186-12994-1-git-send-email-nm@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Nishanth Menon Cc: linux-omap , Kevin Hilman , Paul Walmsley Nishanth Menon wrote: > omap3_pm_init_opp_table should be under #ifdef CONFIG_PM > else build fails when PM is disabled. Reported by Paul originally. > > Cc: Kevin Hilman > Cc: Paul Walmsley > Reported-by: Paul Walmsley > > Signed-off-by: Nishanth Menon > --- > arch/arm/mach-omap2/pm.h | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h > index d257225..5fc056f 100644 > --- a/arch/arm/mach-omap2/pm.h > +++ b/arch/arm/mach-omap2/pm.h > @@ -69,7 +69,13 @@ static inline void omap3_pm_init_vc(struct prm_setup_vc *setup_vc) > * Initialize the basic opp table here, board files could choose to modify opp > * table after the basic initialization > */ > +#ifdef CONFIG_PM > extern void omap3_pm_init_opp_table(void); > +#else > +static inline void omap3_pm_init_opp_table(void) > +{ > +} > +#endif > > extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); > extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state); This patch IMHO just solves the build issue. The runtime behaviour is a nasty crash. OMAP architecture has tied CONFIG_PM with CONFIG_CPU_FREQ. So I think we need a fix that solves the runtime behavior too.