* [PATCH] omap4: fix build error when undefining CONFIG_SMP
@ 2011-06-13 6:25 Vadillo, Miguel
2011-06-13 6:37 ` Santosh Shilimkar
0 siblings, 1 reply; 6+ messages in thread
From: Vadillo, Miguel @ 2011-06-13 6:25 UTC (permalink / raw)
To: linux-omap; +Cc: Santosh Shilimkar
>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(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP
2011-06-13 6:25 [PATCH] omap4: fix build error when undefining CONFIG_SMP Vadillo, Miguel
@ 2011-06-13 6:37 ` Santosh Shilimkar
2011-06-13 14:35 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Santosh Shilimkar @ 2011-06-13 6:37 UTC (permalink / raw)
To: Vadillo, Miguel; +Cc: linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP
2011-06-13 6:37 ` Santosh Shilimkar
@ 2011-06-13 14:35 ` Tony Lindgren
2011-06-13 14:43 ` Santosh Shilimkar
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2011-06-13 14:35 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: Vadillo, Miguel, linux-omap
* Santosh Shilimkar <santosh.shilimkar@ti.com> [110612 23:32]:
> On 6/13/2011 11:55 AM, Vadillo, Miguel wrote:
> >
> >Function omap_smc2 is undeclared when disabling SMP
Looks like this won't apply to current mainline kernel, care
to check if it's still needed?
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP
2011-06-13 14:35 ` Tony Lindgren
@ 2011-06-13 14:43 ` Santosh Shilimkar
2011-06-13 14:49 ` Vadillo, Miguel
0 siblings, 1 reply; 6+ messages in thread
From: Santosh Shilimkar @ 2011-06-13 14:43 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Vadillo, Miguel, linux-omap
On 6/13/2011 8:05 PM, Tony Lindgren wrote:
> * Santosh Shilimkar<santosh.shilimkar@ti.com> [110612 23:32]:
>> On 6/13/2011 11:55 AM, Vadillo, Miguel wrote:
>>>
>>> Function omap_smc2 is undeclared when disabling SMP
>
> Looks like this won't apply to current mainline kernel, care
> to check if it's still needed?
>
Yep. After checking, looks like patch isn't generated
against mainline. It's not needed against current mainline.
Sorry for oversight.
Miguel,
Did you post this by mistake ?
Looking at hunks it apears to be needed against
internal tree.
Regards
Santosh
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] omap4: fix build error when undefining CONFIG_SMP
2011-06-13 14:43 ` Santosh Shilimkar
@ 2011-06-13 14:49 ` Vadillo, Miguel
2011-06-13 14:53 ` Santosh Shilimkar
0 siblings, 1 reply; 6+ messages in thread
From: Vadillo, Miguel @ 2011-06-13 14:49 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: Tony Lindgren, linux-omap
Yes, sorry about this mistake, the patch its just for an internal tree
and I wasn't careful enough to check the mainline. Sorry about the
noise.
Santosh,
I think is needed in the internal branch p-android-omap-2.6.39
On Mon, Jun 13, 2011 at 9:43 AM, Santosh Shilimkar
<santosh.shilimkar@ti.com> wrote:
> On 6/13/2011 8:05 PM, Tony Lindgren wrote:
>>
>> * Santosh Shilimkar<santosh.shilimkar@ti.com> [110612 23:32]:
>>>
>>> On 6/13/2011 11:55 AM, Vadillo, Miguel wrote:
>>>>
>>>> Function omap_smc2 is undeclared when disabling SMP
>>
>> Looks like this won't apply to current mainline kernel, care
>> to check if it's still needed?
>>
> Yep. After checking, looks like patch isn't generated
> against mainline. It's not needed against current mainline.
> Sorry for oversight.
>
>
> Miguel,
> Did you post this by mistake ?
> Looking at hunks it apears to be needed against
> internal tree.
>
> Regards
> Santosh
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-06-13 14:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-13 6:25 [PATCH] omap4: fix build error when undefining CONFIG_SMP Vadillo, Miguel
2011-06-13 6:37 ` Santosh Shilimkar
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox