diff for duplicates of <20200116064531.483522-7-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index e2a9e36..4b97b36 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,11 +27,11 @@ index 5e907a954532..501d565690b5 100644 @@ -393,7 +393,7 @@ config HAVE_ARCH_JUMP_LABEL config HAVE_ARCH_JUMP_LABEL_RELATIVE bool - + -config HAVE_RCU_TABLE_FREE +config MMU_GATHER_RCU_TABLE_FREE bool - + config HAVE_MMU_GATHER_PAGE_SIZE diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 96dab76da3b3..36445579243c 100644 @@ -51,14 +51,14 @@ index 669474add486..46a21cee3442 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -37,7 +37,7 @@ static inline void __tlb_remove_table(void *_table) - + #include <asm-generic/tlb.h> - + -#ifndef CONFIG_HAVE_RCU_TABLE_FREE +#ifndef CONFIG_MMU_GATHER_RCU_TABLE_FREE #define tlb_remove_table(tlb, entry) tlb_remove_page(tlb, entry) #endif - + diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e688dfad0b72..a434f7c2438f 100644 --- a/arch/arm64/Kconfig @@ -118,12 +118,12 @@ index 8cb8f3833239..6820d357581c 100644 @@ -33,7 +33,7 @@ void flush_tlb_pending(void); * and therefore we don't need a TLBI when freeing page-table pages. */ - + -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE #define tlb_needs_table_invalidate() (false) #endif - + diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5e8949953660..f809bed408dd 100644 --- a/arch/x86/Kconfig @@ -168,7 +168,7 @@ index 1a4cea5f95df..04a1b8f08eea 100644 @@ -142,7 +142,7 @@ * Use this if your architecture lacks an efficient flush_tlb_range(). */ - + -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE /* @@ -176,26 +176,26 @@ index 1a4cea5f95df..04a1b8f08eea 100644 * @@ -193,10 +193,10 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table); #else - + #ifdef tlb_needs_table_invalidate -#error tlb_needs_table_invalidate() requires HAVE_RCU_TABLE_FREE +#error tlb_needs_table_invalidate() requires MMU_GATHER_RCU_TABLE_FREE #endif - + -#endif /* CONFIG_HAVE_RCU_TABLE_FREE */ +#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ - - + + #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER @@ -235,7 +235,7 @@ extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, struct mmu_gather { struct mm_struct *mm; - + -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE struct mmu_table_batch *batch; #endif - + diff --git a/mm/gup.c b/mm/gup.c index 7646bf993b25..789fadc011b8 100644 --- a/mm/gup.c @@ -214,21 +214,21 @@ index 7c1b8f67af7b..86bb2176e173 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -91,7 +91,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_ - + #endif /* HAVE_MMU_GATHER_NO_GATHER */ - + -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE - + /* * See the comment near struct mmu_table_batch. @@ -173,11 +173,11 @@ void tlb_remove_table(struct mmu_gather *tlb, void *table) tlb_table_flush(tlb); } - + -#endif /* CONFIG_HAVE_RCU_TABLE_FREE */ +#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ - + static void tlb_flush_mmu_free(struct mmu_gather *tlb) { -#ifdef CONFIG_HAVE_RCU_TABLE_FREE @@ -239,7 +239,7 @@ index 7c1b8f67af7b..86bb2176e173 100644 @@ -220,7 +220,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, tlb->batch_count = 0; #endif - + -#ifdef CONFIG_HAVE_RCU_TABLE_FREE +#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb->batch = NULL; diff --git a/a/content_digest b/N1/content_digest index bdd12ad..a4bffe6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -42,11 +42,11 @@ "@@ -393,7 +393,7 @@ config HAVE_ARCH_JUMP_LABEL\n" " config HAVE_ARCH_JUMP_LABEL_RELATIVE\n" " \tbool\n" - " \n" + "\n" "-config HAVE_RCU_TABLE_FREE\n" "+config MMU_GATHER_RCU_TABLE_FREE\n" " \tbool\n" - " \n" + "\n" " config HAVE_MMU_GATHER_PAGE_SIZE\n" "diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig\n" "index 96dab76da3b3..36445579243c 100644\n" @@ -66,14 +66,14 @@ "--- a/arch/arm/include/asm/tlb.h\n" "+++ b/arch/arm/include/asm/tlb.h\n" "@@ -37,7 +37,7 @@ static inline void __tlb_remove_table(void *_table)\n" - " \n" + "\n" " #include <asm-generic/tlb.h>\n" - " \n" + "\n" "-#ifndef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifndef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " #define tlb_remove_table(tlb, entry) tlb_remove_page(tlb, entry)\n" " #endif\n" - " \n" + "\n" "diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig\n" "index e688dfad0b72..a434f7c2438f 100644\n" "--- a/arch/arm64/Kconfig\n" @@ -133,12 +133,12 @@ "@@ -33,7 +33,7 @@ void flush_tlb_pending(void);\n" " * and therefore we don't need a TLBI when freeing page-table pages.\n" " */\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " #define tlb_needs_table_invalidate()\t(false)\n" " #endif\n" - " \n" + "\n" "diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig\n" "index 5e8949953660..f809bed408dd 100644\n" "--- a/arch/x86/Kconfig\n" @@ -183,7 +183,7 @@ "@@ -142,7 +142,7 @@\n" " * Use this if your architecture lacks an efficient flush_tlb_range().\n" " */\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " /*\n" @@ -191,26 +191,26 @@ " *\n" "@@ -193,10 +193,10 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table);\n" " #else\n" - " \n" + "\n" " #ifdef tlb_needs_table_invalidate\n" "-#error tlb_needs_table_invalidate() requires HAVE_RCU_TABLE_FREE\n" "+#error tlb_needs_table_invalidate() requires MMU_GATHER_RCU_TABLE_FREE\n" " #endif\n" - " \n" + "\n" "-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */\n" "+#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */\n" - " \n" - " \n" + "\n" + "\n" " #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "@@ -235,7 +235,7 @@ extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page,\n" " struct mmu_gather {\n" " \tstruct mm_struct\t*mm;\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " \tstruct mmu_table_batch\t*batch;\n" " #endif\n" - " \n" + "\n" "diff --git a/mm/gup.c b/mm/gup.c\n" "index 7646bf993b25..789fadc011b8 100644\n" "--- a/mm/gup.c\n" @@ -229,21 +229,21 @@ "--- a/mm/mmu_gather.c\n" "+++ b/mm/mmu_gather.c\n" "@@ -91,7 +91,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_\n" - " \n" + "\n" " #endif /* HAVE_MMU_GATHER_NO_GATHER */\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" - " \n" + "\n" " /*\n" " * See the comment near struct mmu_table_batch.\n" "@@ -173,11 +173,11 @@ void tlb_remove_table(struct mmu_gather *tlb, void *table)\n" " \t\ttlb_table_flush(tlb);\n" " }\n" - " \n" + "\n" "-#endif /* CONFIG_HAVE_RCU_TABLE_FREE */\n" "+#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */\n" - " \n" + "\n" " static void tlb_flush_mmu_free(struct mmu_gather *tlb)\n" " {\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" @@ -254,7 +254,7 @@ "@@ -220,7 +220,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,\n" " \ttlb->batch_count = 0;\n" " #endif\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_RCU_TABLE_FREE\n" "+#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " \ttlb->batch = NULL;\n" @@ -263,4 +263,4 @@ "-- \n" 2.24.1 -5348501f2d502a45a0e9586802c3fe34ab4cef5382541e65979c2e4f18d389ed +58bda99dd570145a51db826c782024f888ab70142bc0f7755dc155fb5854e03a
diff --git a/a/content_digest b/N2/content_digest index bdd12ad..72e7121 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,10 +6,10 @@ peterz@infradead.org will@kernel.org " mpe@ellerman.id.au\0" - "Cc\0linux-mm@kvack.org" - linux-kernel@vger.kernel.org - linux-arch@vger.kernel.org + "Cc\0linux-arch@vger.kernel.org" + linux-mm@kvack.org linuxppc-dev@lists.ozlabs.org + linux-kernel@vger.kernel.org " Aneesh Kumar K . V <aneesh.kumar@linux.ibm.com>\0" "\00:1\0" "b\0" @@ -263,4 +263,4 @@ "-- \n" 2.24.1 -5348501f2d502a45a0e9586802c3fe34ab4cef5382541e65979c2e4f18d389ed +69d342ad53eafea54dbc37bb8d5eab9dd0b6d2cb54cda7fefe3c04ec6be0059d
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.