From mboxrd@z Thu Jan 1 00:00:00 1970 From: santosh.shilimkar@ti.com (Santosh Shilimkar) Date: Thu, 13 Mar 2014 05:59:09 +0800 Subject: [PATCH] ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM In-Reply-To: <1394660600-3771-1-git-send-email-nm@ti.com> References: <1394660600-3771-1-git-send-email-nm@ti.com> Message-ID: <5320D8AD.5000308@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 13 March 2014 05:43 AM, Nishanth Menon wrote: > Just like IS_PM34XX_ERRATUM, IS_PM44XX_ERRATUM is valid only if > CONFIG_PM is enabled, else, disabling CONFIG_PM results in build > failure complaining about the following: > arch/arm/mach-omap2/built-in.o: In function `omap4_boot_secondary': > :(.text+0x8a70): undefined reference to `pm44xx_errata' > Not entirely accurate since CPU hotplug doesn't depend on CONFIG_PM > Fixes: c962184 (ARM: OMAP4: PM: add errata support) > Reported-by: Tony Lindgren > Signed-off-by: Nishanth Menon > --- > > Patch based on: v3.14-rc6 > Reported originally with a randconfig defconfig: http://slexy.org/view/s21U7eF4k1 > But without the PM sleep code, hotplug won't work either. SO I think its ok assumption in this particular case > arch/arm/mach-omap2/pm.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h > index 7bdd22a..d4d0fce 100644 > --- a/arch/arm/mach-omap2/pm.h > +++ b/arch/arm/mach-omap2/pm.h > @@ -103,7 +103,7 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { } > > #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD (1 << 0) > > -#if defined(CONFIG_ARCH_OMAP4) > +#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) > extern u16 pm44xx_errata; > #define IS_PM44XX_ERRATUM(id) (pm44xx_errata & (id)) > #else >