From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: "Vadillo, Miguel" <vadillo@ti.com>
Cc: linux-omap@vger.kernel.org
Subject: Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP
Date: Mon, 13 Jun 2011 12:07:05 +0530 [thread overview]
Message-ID: <4DF5B011.7080709@ti.com> (raw)
In-Reply-To: <BANLkTimf9D55OZ+-sOMPw2_WgG3QO_RooQ@mail.gmail.com>
On 6/13/2011 11:55 AM, Vadillo, Miguel wrote:
> From 0cffeab240c6009fbc81783cec16d35dc240196a Mon Sep 17 00:00:00 2001
> From: Miguel Vadillo<vadillo@ti.com>
> 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<vadillo@ti.com>
> ---
> arch/arm/mach-omap2/include/mach/omap4-common.h | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> 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
next prev parent reply other threads:[~2011-06-13 6:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 6:25 [PATCH] omap4: fix build error when undefining CONFIG_SMP Vadillo, Miguel
2011-06-13 6:37 ` Santosh Shilimkar [this message]
2011-06-13 14:35 ` Tony Lindgren
2011-06-13 14:43 ` Santosh Shilimkar
2011-06-13 14:49 ` Vadillo, Miguel
2011-06-13 14:53 ` Santosh Shilimkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DF5B011.7080709@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=vadillo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.