* Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [100902 10:00]: > On Thu, Sep 02, 2010 at 09:18:47AM -0700, Tony Lindgren wrote: > > >From 7044c13594c3023da6095f8d432eda260bc3207f Mon Sep 17 00:00:00 2001 > > From: Tony Lindgren <tony@xxxxxxxxxxx> > > Date: Mon, 30 Aug 2010 14:00:54 -0700 > > Subject: [PATCH 1/6] ARM: Add inline function smp_on_up() for early init testing > > > > Add inline function smp_on_up() for early init checks, and > > change build_mem_type_table to use it. > > Isn't something missing from this - such as a C-mode definition of > SMP() and UP() ? Oops, here's the missing patch. Tony >From e52db459dba0088fcff66904069630a24a811db8 Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@xxxxxxxxxxx> Date: Wed, 1 Sep 2010 15:02:50 -0700 Subject: [PATCH] ARM: Add SMP and UP macros for inline assembly We can't use the macros in asm/assembler.h in C inline functions. Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 55974d2..340795c 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -154,6 +154,10 @@ .long 9999b,9001f; \ .popsection +/* + * SMP and UP defines for assembly code. See also asm/smp_plat.h + * for the SMP and UP defines for inline code. + */ #ifdef CONFIG_SMP #define SMP(instr...) \ 9998: instr diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h index e621530..8db3512 100644 --- a/arch/arm/include/asm/smp_plat.h +++ b/arch/arm/include/asm/smp_plat.h @@ -18,4 +18,25 @@ static inline int cache_ops_need_broadcast(void) return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 1; } +/* + * SMP and UP defines for inline functions. See also asm/assembler.h + * for the SMP and UP defines for assembly code. + */ +#ifdef CONFIG_SMP +#define _str(s...) #s +#define _9998(s...) _str(9998: s\n) + +#define SMP(instr...) \ + _9998(instr) + +#define UP(instr...) \ + _str(.pushsection ".smpalt.init", "a"\n) \ + _str(.word 9998b\n) \ + _str(instr\n) \ + _str(.popsection\n) +#else +#define SMP(instr...) +#define UP(instr...) _str(instr) +#endif + #endif -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
