diff for duplicates of <20200116064531.483522-8-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index a814304..36efa84 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,11 +18,11 @@ index 501d565690b5..e8548211b6a9 100644 @@ -396,7 +396,7 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE config MMU_GATHER_RCU_TABLE_FREE bool - + -config HAVE_MMU_GATHER_PAGE_SIZE +config MMU_GATHER_PAGE_SIZE bool - + config MMU_GATHER_NO_RANGE diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 955759234776..cefacb9c8f48 100644 @@ -60,7 +60,7 @@ index 04a1b8f08eea..53befa5acb27 100644 @@ -279,7 +282,7 @@ struct mmu_gather { struct mmu_gather_batch local; struct page *__pages[MMU_GATHER_BUNDLE]; - + -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE unsigned int page_size; @@ -80,14 +80,14 @@ index 86bb2176e173..297c70307367 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -69,7 +69,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_ - + VM_BUG_ON(!tlb->end); - + -#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE VM_WARN_ON(tlb->page_size != page_size); #endif - + @@ -223,7 +223,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb->batch = NULL; @@ -96,6 +96,6 @@ index 86bb2176e173..297c70307367 100644 +#ifdef CONFIG_MMU_GATHER_PAGE_SIZE tlb->page_size = 0; #endif - + -- 2.24.1 diff --git a/a/content_digest b/N1/content_digest index a589b69..2c3ad9f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,11 +33,11 @@ "@@ -396,7 +396,7 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE\n" " config MMU_GATHER_RCU_TABLE_FREE\n" " \tbool\n" - " \n" + "\n" "-config HAVE_MMU_GATHER_PAGE_SIZE\n" "+config MMU_GATHER_PAGE_SIZE\n" " \tbool\n" - " \n" + "\n" " config MMU_GATHER_NO_RANGE\n" "diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig\n" "index 955759234776..cefacb9c8f48 100644\n" @@ -75,7 +75,7 @@ "@@ -279,7 +282,7 @@ struct mmu_gather {\n" " \tstruct mmu_gather_batch\tlocal;\n" " \tstruct page\t\t*__pages[MMU_GATHER_BUNDLE];\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE\n" "+#ifdef CONFIG_MMU_GATHER_PAGE_SIZE\n" " \tunsigned int page_size;\n" @@ -95,14 +95,14 @@ "--- a/mm/mmu_gather.c\n" "+++ b/mm/mmu_gather.c\n" "@@ -69,7 +69,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_\n" - " \n" + "\n" " \tVM_BUG_ON(!tlb->end);\n" - " \n" + "\n" "-#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE\n" "+#ifdef CONFIG_MMU_GATHER_PAGE_SIZE\n" " \tVM_WARN_ON(tlb->page_size != page_size);\n" " #endif\n" - " \n" + "\n" "@@ -223,7 +223,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,\n" " #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE\n" " \ttlb->batch = NULL;\n" @@ -111,8 +111,8 @@ "+#ifdef CONFIG_MMU_GATHER_PAGE_SIZE\n" " \ttlb->page_size = 0;\n" " #endif\n" - " \n" + "\n" "-- \n" 2.24.1 -5b6f0733be05f9997790fc8655560a20c6d3f26317edf9f782a295420648a469 +5d17410bf751b74751cea0a8e450a9e9129bd4752fdec668b898b8035148893a
diff --git a/a/content_digest b/N2/content_digest index a589b69..505f409 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" @@ -115,4 +115,4 @@ "-- \n" 2.24.1 -5b6f0733be05f9997790fc8655560a20c6d3f26317edf9f782a295420648a469 +5e80ec0573a84624a0a0713df84eb8bb4173aaec6d03e278adb1a89fee9b1431
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.