diff for duplicates of <20100902162039.GM11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 6642b1e..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,53 +1 @@ ->From 253e91b76e104dbdf05c5c3eaf9cbf426972c938 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Wed, 1 Sep 2010 16:49:13 -0700 -Subject: [PATCH 3/6] ARM: Fix v7wbi_tlb_flags for SMP on UP -Fix v7wbi_tlb_flags for SMP on UP. Note that we must enable MULTI_TLB -to avoid undefined reference to cpu_tlb error. - -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - arch/arm/include/asm/tlbflush.h | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h -index 1fd0db9..55e1dd9 100644 ---- a/arch/arm/include/asm/tlbflush.h -+++ b/arch/arm/include/asm/tlbflush.h -@@ -189,20 +189,32 @@ - # define v6wbi_always_flags (-1UL) - #endif - -+#define v7wbi_tlb_flags_common (TLB_WB | TLB_DCLEAN) - #define v7wbi_tlb_flags_smp (TLB_WB | TLB_DCLEAN | TLB_V7_IS_BTB | \ - TLB_V7_UIS_FULL | TLB_V7_UIS_PAGE | TLB_V7_UIS_ASID) - #define v7wbi_tlb_flags_up (TLB_WB | TLB_DCLEAN | TLB_BTB | \ - TLB_V6_U_FULL | TLB_V6_U_PAGE | TLB_V6_U_ASID) - - #ifdef CONFIG_SMP -+#ifdef CONFIG_SMP_ON_UP -+#define v7wbi_tlb_flags (v7wbi_tlb_flags_smp | v7wbi_tlb_flags_up) -+#else - #define v7wbi_tlb_flags v7wbi_tlb_flags_smp -+#endif - #else - #define v7wbi_tlb_flags v7wbi_tlb_flags_up - #endif - - #ifdef CONFIG_CPU_TLB_V7 - # define v7wbi_possible_flags v7wbi_tlb_flags --# define v7wbi_always_flags v7wbi_tlb_flags -+# ifdef CONFIG_SMP_ON_UP -+# define v7wbi_always_flags v7wbi_tlb_flags_common -+# ifndef MULTI_TLB -+# define MULTI_TLB 1 -+# endif -+# else -+# define v7wbi_always_flags v7wbi_tlb_flags -+# endif - # ifdef _TLB - # define MULTI_TLB 1 - # else --- -1.7.1 diff --git a/a/content_digest b/N1/content_digest index 9d0fbef..a429bfd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,68 +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 3/6] ARM: Fix v7wbi_tlb_flags for SMP on UP\0" "Date\0Thu, 2 Sep 2010 09:20: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 253e91b76e104dbdf05c5c3eaf9cbf426972c938 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 1 Sep 2010 16:49:13 -0700\n" - "Subject: [PATCH 3/6] ARM: Fix v7wbi_tlb_flags for SMP on UP\n" - "\n" - "Fix v7wbi_tlb_flags for SMP on UP. Note that we must enable MULTI_TLB\n" - "to avoid undefined reference to cpu_tlb error.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" - " arch/arm/include/asm/tlbflush.h | 14 +++++++++++++-\n" - " 1 files changed, 13 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h\n" - "index 1fd0db9..55e1dd9 100644\n" - "--- a/arch/arm/include/asm/tlbflush.h\n" - "+++ b/arch/arm/include/asm/tlbflush.h\n" - "@@ -189,20 +189,32 @@\n" - " # define v6wbi_always_flags\t(-1UL)\n" - " #endif\n" - " \n" - "+#define v7wbi_tlb_flags_common (TLB_WB | TLB_DCLEAN)\n" - " #define v7wbi_tlb_flags_smp (TLB_WB | TLB_DCLEAN | TLB_V7_IS_BTB | \\\n" - " \t\t\t TLB_V7_UIS_FULL | TLB_V7_UIS_PAGE | TLB_V7_UIS_ASID)\n" - " #define v7wbi_tlb_flags_up (TLB_WB | TLB_DCLEAN | TLB_BTB | \\\n" - " \t\t\t TLB_V6_U_FULL | TLB_V6_U_PAGE | TLB_V6_U_ASID)\n" - " \n" - " #ifdef CONFIG_SMP\n" - "+#ifdef CONFIG_SMP_ON_UP\n" - "+#define v7wbi_tlb_flags\t(v7wbi_tlb_flags_smp | v7wbi_tlb_flags_up)\n" - "+#else\n" - " #define v7wbi_tlb_flags\tv7wbi_tlb_flags_smp\n" - "+#endif\n" - " #else\n" - " #define v7wbi_tlb_flags\tv7wbi_tlb_flags_up\n" - " #endif\n" - " \n" - " #ifdef CONFIG_CPU_TLB_V7\n" - " # define v7wbi_possible_flags\tv7wbi_tlb_flags\n" - "-# define v7wbi_always_flags\tv7wbi_tlb_flags\n" - "+# ifdef CONFIG_SMP_ON_UP\n" - "+# define v7wbi_always_flags\tv7wbi_tlb_flags_common\n" - "+# ifndef MULTI_TLB\n" - "+# define MULTI_TLB 1\n" - "+# endif\n" - "+# else\n" - "+# define v7wbi_always_flags\tv7wbi_tlb_flags\n" - "+# endif\n" - " # ifdef _TLB\n" - " # define MULTI_TLB 1\n" - " # else\n" - "-- \n" - 1.7.1 -f7fa685c9de1fc6c6133878a7ebfad5d427dd1c3f9a9623044cc0a43e9ee59d4 +0f9843bf68e2b5bcb83d5e04f13499c9e4de85c143c7d0237fc22920298f4629
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.