diff for duplicates of <20200116064531.483522-9-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 44cdff5..4c0619c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,11 +18,11 @@ index e8548211b6a9..c35668fbf4d4 100644 @@ -402,7 +402,7 @@ config MMU_GATHER_PAGE_SIZE config MMU_GATHER_NO_RANGE bool - + -config HAVE_MMU_GATHER_NO_GATHER +config MMU_GATHER_NO_GATHER bool - + config ARCH_HAVE_NMI_SAFE_CMPXCHG diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index e2cde82a1a3c..de39c2e92435 100644 @@ -56,21 +56,21 @@ index 53befa5acb27..ca0fe75b5355 100644 + * This is useful if your architecture already flushes TLB entries in the + * various ptep_get_and_clear() functions. */ - + #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE @@ -202,7 +212,7 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table); #endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ - - + + -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER /* * If we can't allocate a page to make a big batch of page pointers * to work on, then just handle a few from the on-stack structure. @@ -277,7 +287,7 @@ struct mmu_gather { - + unsigned int batch_count; - + -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER struct mmu_gather_batch *active; @@ -83,21 +83,21 @@ index 297c70307367..a28c74328085 100644 @@ -11,7 +11,7 @@ #include <asm/pgalloc.h> #include <asm/tlb.h> - + -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER - + static bool tlb_next_batch(struct mmu_gather *tlb) { @@ -89,7 +89,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_ return false; } - + -#endif /* HAVE_MMU_GATHER_NO_GATHER */ +#endif /* MMU_GATHER_NO_GATHER */ - + #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE - + @@ -180,7 +180,7 @@ static void tlb_flush_mmu_free(struct mmu_gather *tlb) #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb_table_flush(tlb); @@ -110,16 +110,16 @@ index 297c70307367..a28c74328085 100644 @@ -211,7 +211,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, /* Is it from 0 to ~0? */ tlb->fullmm = !(start | (end+1)); - + -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb->need_flush_all = 0; tlb->local.next = NULL; tlb->local.nr = 0; @@ -271,7 +271,7 @@ void tlb_finish_mmu(struct mmu_gather *tlb, - + tlb_flush_mmu(tlb); - + -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb_batch_list_free(tlb); diff --git a/a/content_digest b/N1/content_digest index ba8e59c..f54ed9e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,11 +33,11 @@ "@@ -402,7 +402,7 @@ config MMU_GATHER_PAGE_SIZE\n" " config MMU_GATHER_NO_RANGE\n" " \tbool\n" - " \n" + "\n" "-config HAVE_MMU_GATHER_NO_GATHER\n" "+config MMU_GATHER_NO_GATHER\n" " \tbool\n" - " \n" + "\n" " config ARCH_HAVE_NMI_SAFE_CMPXCHG\n" "diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig\n" "index e2cde82a1a3c..de39c2e92435 100644\n" @@ -71,21 +71,21 @@ "+ * This is useful if your architecture already flushes TLB entries in the\n" "+ * various ptep_get_and_clear() functions.\n" " */\n" - " \n" + "\n" " #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" "@@ -202,7 +212,7 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table);\n" " #endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */\n" - " \n" - " \n" + "\n" + "\n" "-#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "+#ifndef CONFIG_MMU_GATHER_NO_GATHER\n" " /*\n" " * If we can't allocate a page to make a big batch of page pointers\n" " * to work on, then just handle a few from the on-stack structure.\n" "@@ -277,7 +287,7 @@ struct mmu_gather {\n" - " \n" + "\n" " \tunsigned int\t\tbatch_count;\n" - " \n" + "\n" "-#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "+#ifndef CONFIG_MMU_GATHER_NO_GATHER\n" " \tstruct mmu_gather_batch *active;\n" @@ -98,21 +98,21 @@ "@@ -11,7 +11,7 @@\n" " #include <asm/pgalloc.h>\n" " #include <asm/tlb.h>\n" - " \n" + "\n" "-#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "+#ifndef CONFIG_MMU_GATHER_NO_GATHER\n" - " \n" + "\n" " static bool tlb_next_batch(struct mmu_gather *tlb)\n" " {\n" "@@ -89,7 +89,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_\n" " \treturn false;\n" " }\n" - " \n" + "\n" "-#endif /* HAVE_MMU_GATHER_NO_GATHER */\n" "+#endif /* MMU_GATHER_NO_GATHER */\n" - " \n" + "\n" " #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" - " \n" + "\n" "@@ -180,7 +180,7 @@ static void tlb_flush_mmu_free(struct mmu_gather *tlb)\n" " #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " \ttlb_table_flush(tlb);\n" @@ -125,16 +125,16 @@ "@@ -211,7 +211,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,\n" " \t/* Is it from 0 to ~0? */\n" " \ttlb->fullmm = !(start | (end+1));\n" - " \n" + "\n" "-#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "+#ifndef CONFIG_MMU_GATHER_NO_GATHER\n" " \ttlb->need_flush_all = 0;\n" " \ttlb->local.next = NULL;\n" " \ttlb->local.nr = 0;\n" "@@ -271,7 +271,7 @@ void tlb_finish_mmu(struct mmu_gather *tlb,\n" - " \n" + "\n" " \ttlb_flush_mmu(tlb);\n" - " \n" + "\n" "-#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER\n" "+#ifndef CONFIG_MMU_GATHER_NO_GATHER\n" " \ttlb_batch_list_free(tlb);\n" @@ -143,4 +143,4 @@ "-- \n" 2.24.1 -3f54f71d8fd7f748e8993dc549a2af6450c562c7f94f67946f8c57026413af77 +f3b7686bf4aeca3624f125a918de295b5ce4ea5dcbd9cb721f3948b88f0f5c25
diff --git a/a/content_digest b/N2/content_digest index ba8e59c..3eafd12 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" @@ -143,4 +143,4 @@ "-- \n" 2.24.1 -3f54f71d8fd7f748e8993dc549a2af6450c562c7f94f67946f8c57026413af77 +357e63b1d968140181ef55bded2b36459aafc094cfab794129094b05336afcbf
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.