From mboxrd@z Thu Jan 1 00:00:00 1970 From: Santosh Shilimkar Subject: Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP Date: Mon, 13 Jun 2011 12:07:05 +0530 Message-ID: <4DF5B011.7080709@ti.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from na3sys009aog117.obsmtp.com ([74.125.149.242]:37976 "EHLO na3sys009aog117.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754Ab1FMGhL (ORCPT ); Mon, 13 Jun 2011 02:37:11 -0400 Received: by mail-gx0-f178.google.com with SMTP id 8so2914278gxk.9 for ; Sun, 12 Jun 2011 23:37:09 -0700 (PDT) In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Vadillo, Miguel" Cc: linux-omap@vger.kernel.org On 6/13/2011 11:55 AM, Vadillo, Miguel wrote: > From 0cffeab240c6009fbc81783cec16d35dc240196a Mon Sep 17 00:00:00 2001 > From: Miguel Vadillo > Date: Fri, 10 Jun 2011 16:06:20 -0500 > Subject: [PATCH] omap4: fix build error when undefining CONFIG_SMP > > Function omap_smc2 is undeclared when disabling SMP > > Signed-off-by: Miguel Vadillo > --- > arch/arm/mach-omap2/include/mach/omap4-common.h | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > Acked-by: Santosh Shilimkar > diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h > b/arch/arm/mach-omap2/include/mach/omap4-common.h > index f9769d3..1923b4e 100644 > --- a/arch/arm/mach-omap2/include/mach/omap4-common.h > +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h > @@ -74,7 +74,7 @@ extern int omap4_mpuss_init(void); > extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state); > extern void omap4_cpu_suspend(unsigned int cpu, unsigned int save_state); > extern void omap4_cpu_resume(void); > -extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); > +extern u32 omap_smc2(u32 id, u32 flag, u32 pargs); > extern u32 omap4_secure_dispatcher(u32 idx, u32 flag, u32 nargs, > u32 arg1, u32 arg2, u32 arg3, u32 arg4); > #else > @@ -99,6 +99,10 @@ static inline void omap4_cpu_resume(void) > { > } > > +static inline u32 omap_smc2(u32 id, u32 flag, u32 pargs) > +{ > + return 0; > +} > #endif > #endif /* __ASSEMBLER__ */ > #endif /* OMAP_ARCH_OMAP4_COMMON_H */ > -- > 1.7.1