diff for duplicates of <20100902161940.GL11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 4fd48eb..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,41 +1 @@ ->From 16c866489613ef8ea9d28ecf861f5a7ff4d60377 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Thu, 2 Sep 2010 08:20:02 -0700 -Subject: [PATCH 2/6] ARM: Use SMP and UP macros for cacheflush -Use SMP and UP macros for cacheflush. Note that __flush_icache_all -currently won't work properly on ARMv7 SMP if support for ARMv6 is -compiled in. - -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - arch/arm/include/asm/cacheflush.h | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h -index 4656a24..09a893e 100644 ---- a/arch/arm/include/asm/cacheflush.h -+++ b/arch/arm/include/asm/cacheflush.h -@@ -16,6 +16,7 @@ - #include <asm/shmparam.h> - #include <asm/cachetype.h> - #include <asm/outercache.h> -+#include <asm/smp_plat.h> - - #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) - -@@ -372,8 +373,10 @@ static inline void __flush_icache_all(void) - extern void v6_icache_inval_all(void); - v6_icache_inval_all(); - #elif defined(CONFIG_SMP) && __LINUX_ARM_ARCH__ >= 7 -- asm("mcr p15, 0, %0, c7, c1, 0 @ invalidate I-cache inner shareable\n" -- : -+ asm( \ -+ SMP(mcr p15, 0, %0, c7, c1, 0 @ inv I-cache inner shareable) \ -+ UP(mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache) \ -+ : \ - : "r" (0)); - #else - asm("mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache\n" --- -1.7.1 diff --git a/a/content_digest b/N1/content_digest index c145c0d..e00bf70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,56 +8,11 @@ "ref\020100830225527.GC11597@atomide.com\0" "ref\020100902133637.GJ26319@n2100.arm.linux.org.uk\0" "ref\020100902161659.GJ11597@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 2/6] ARM: Use SMP and UP macros for cacheflush\0" "Date\0Thu, 2 Sep 2010 09:19:40 -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" - ">From 16c866489613ef8ea9d28ecf861f5a7ff4d60377 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Thu, 2 Sep 2010 08:20:02 -0700\n" - "Subject: [PATCH 2/6] ARM: Use SMP and UP macros for cacheflush\n" - "\n" - "Use SMP and UP macros for cacheflush. Note that __flush_icache_all\n" - "currently won't work properly on ARMv7 SMP if support for ARMv6 is\n" - "compiled in.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" - " arch/arm/include/asm/cacheflush.h | 7 +++++--\n" - " 1 files changed, 5 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h\n" - "index 4656a24..09a893e 100644\n" - "--- a/arch/arm/include/asm/cacheflush.h\n" - "+++ b/arch/arm/include/asm/cacheflush.h\n" - "@@ -16,6 +16,7 @@\n" - " #include <asm/shmparam.h>\n" - " #include <asm/cachetype.h>\n" - " #include <asm/outercache.h>\n" - "+#include <asm/smp_plat.h>\n" - " \n" - " #define CACHE_COLOUR(vaddr)\t((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)\n" - " \n" - "@@ -372,8 +373,10 @@ static inline void __flush_icache_all(void)\n" - " \textern void v6_icache_inval_all(void);\n" - " \tv6_icache_inval_all();\n" - " #elif defined(CONFIG_SMP) && __LINUX_ARM_ARCH__ >= 7\n" - "-\tasm(\"mcr\tp15, 0, %0, c7, c1, 0\t@ invalidate I-cache inner shareable\\n\"\n" - "-\t :\n" - "+\tasm(\t\t\t\t\t\t\t\t\\\n" - "+\tSMP(mcr\tp15, 0, %0, c7, c1, 0\t@ inv I-cache inner shareable)\t\\\n" - "+\tUP(mcr\tp15, 0, %0, c7, c5, 0\t@ invalidate I-cache)\t\t\\\n" - "+\t :\t\t\t\t\t\t\t\t\\\n" - " \t : \"r\" (0));\n" - " #else\n" - " \tasm(\"mcr\tp15, 0, %0, c7, c5, 0\t@ invalidate I-cache\\n\"\n" - "-- \n" - 1.7.1 -76493248b2c6053ca506eaf1ea9b49a75eedfaf669a74fd2997227c5fa9a137d +00600055b2ce40eb564e4b4208b8aa51bd7feee6dda3ca394957983a6c40d518
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.