Subject: [PATCH] ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM

From: [email-masked] (Nishanth Menon)
Date: Wed, 12 Mar 2014 17:07:06 -0500

On 03/12/2014 04:59 PM, Santosh Shilimkar wrote:
> 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

Just reporting the build error here.
> 
>> Fixes: c962184 (ARM: OMAP4: PM: add errata support)
>> Reported-by: Tony Lindgren <[email-masked]>
>> Signed-off-by: Nishanth Menon <[email-masked]>
>> ---
>>
>> 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.
yep - agreed,
> SO I think its ok assumption in this particular case

Can I take that as an Ack here? or would you suggest any improvements?

> 
>>  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
>>
> 

-- 
Regards,
Nishanth Menon