diff for duplicates of <20100902171502.GS11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e405cb7..8b1dee1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,57 +14,3 @@ Oops, here's the missing patch. Tony ->From e52db459dba0088fcff66904069630a24a811db8 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -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@atomide.com> - -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 diff --git a/a/content_digest b/N1/content_digest index cb92e15..0993fcf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,14 +8,10 @@ "ref\020100902161659.GJ11597@atomide.com\0" "ref\020100902161846.GK11597@atomide.com\0" "ref\020100902170830.GW26319@n2100.arm.linux.org.uk\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 0/6] ARM: Add inline function smp_on_up() for early init testing\0" "Date\0Thu, 2 Sep 2010 10:15:02 -0700\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Bryan Wu <bryan.wu@canonical.com> - " Will Deacon <will.deacon@arm.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Russell King - ARM Linux <linux@arm.linux.org.uk> [100902 10:00]:\n" @@ -33,60 +29,6 @@ "\n" "Oops, here's the missing patch.\n" "\n" - "Tony\n" - ">From e52db459dba0088fcff66904069630a24a811db8 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 1 Sep 2010 15:02:50 -0700\n" - "Subject: [PATCH] ARM: Add SMP and UP macros for inline assembly\n" - "\n" - "We can't use the macros in asm/assembler.h in C inline functions.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h\n" - "index 55974d2..340795c 100644\n" - "--- a/arch/arm/include/asm/assembler.h\n" - "+++ b/arch/arm/include/asm/assembler.h\n" - "@@ -154,6 +154,10 @@\n" - " \t.long\t9999b,9001f;\t\t\t\\\n" - " \t.popsection\n" - " \n" - "+/*\n" - "+ * SMP and UP defines for assembly code. See also asm/smp_plat.h\n" - "+ * for the SMP and UP defines for inline code.\n" - "+ */\n" - " #ifdef CONFIG_SMP\n" - " #define SMP(instr...)\t\t\t\t\t\t\\\n" - " 9998:\tinstr\n" - "diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h\n" - "index e621530..8db3512 100644\n" - "--- a/arch/arm/include/asm/smp_plat.h\n" - "+++ b/arch/arm/include/asm/smp_plat.h\n" - "@@ -18,4 +18,25 @@ static inline int cache_ops_need_broadcast(void)\n" - " \treturn ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 1;\n" - " }\n" - " \n" - "+/*\n" - "+ * SMP and UP defines for inline functions. See also asm/assembler.h\n" - "+ * for the SMP and UP defines for assembly code.\n" - "+ */\n" - "+#ifdef CONFIG_SMP\n" - "+#define _str(s...)\t#s\n" - "+#define _9998(s...)\t_str(9998:\ts\\n)\n" - "+\n" - "+#define SMP(instr...)\t\t\t\t\t\t\\\n" - "+\t_9998(instr)\n" - "+\n" - "+#define UP(instr...)\t\t\t\t\t\t\\\n" - "+\t_str(.pushsection \".smpalt.init\", \"a\"\\n)\t\t\\\n" - "+\t_str(.word\t9998b\\n)\t\t\t\t\\\n" - "+\t_str(instr\\n)\t\t\t\t\t\t\\\n" - "+\t_str(.popsection\\n)\n" - "+#else\n" - "+#define SMP(instr...)\n" - "+#define UP(instr...)\t_str(instr)\n" - "+#endif\n" - "+\n" - #endif + Tony -a772973d1828038c7aa6c4b399bc0fddf928eac817d8574196dfd6e6f2b8252f +f91c2b004d8fee478db25dc24d41e85f175638ee4b72283b1893550e6356a624
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.