diff for duplicates of <20200114100145.365527-2-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index bed8707..3b646cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,15 +35,15 @@ index 998317702630..dc5c039eb28e 100644 --- a/arch/powerpc/include/asm/book3s/32/pgalloc.h +++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h @@ -49,7 +49,6 @@ static inline void pgtable_free(void *table, unsigned index_size) - + #define get_hugepd_cache_index(x) (x) - + -#ifdef CONFIG_SMP static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) { @@ -66,13 +65,6 @@ static inline void __tlb_remove_table(void *_table) - + pgtable_free(table, shift); } -#else @@ -53,7 +53,7 @@ index 998317702630..dc5c039eb28e 100644 - pgtable_free(table, shift); -} -#endif - + static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, unsigned long address) diff --git a/arch/powerpc/include/asm/book3s/64/pgalloc.h b/arch/powerpc/include/asm/book3s/64/pgalloc.h @@ -68,16 +68,16 @@ index f6968c811026..a41e91bd0580 100644 extern void __tlb_remove_table(void *_table); -#endif void pte_frag_destroy(void *pte_frag); - + static inline pgd_t *radix__pgd_alloc(struct mm_struct *mm) diff --git a/arch/powerpc/include/asm/nohash/pgalloc.h b/arch/powerpc/include/asm/nohash/pgalloc.h index 332b13b4ecdb..29c43665a753 100644 --- a/arch/powerpc/include/asm/nohash/pgalloc.h +++ b/arch/powerpc/include/asm/nohash/pgalloc.h @@ -46,7 +46,6 @@ static inline void pgtable_free(void *table, int shift) - + #define get_hugepd_cache_index(x) (x) - + -#ifdef CONFIG_SMP static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) { @@ -85,7 +85,7 @@ index 332b13b4ecdb..29c43665a753 100644 @@ -64,13 +63,6 @@ static inline void __tlb_remove_table(void *_table) pgtable_free(table, shift); } - + -#else -static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) -{ @@ -103,13 +103,13 @@ index 75483b40fcb1..2bf7e1b4fd82 100644 @@ -378,7 +378,6 @@ static inline void pgtable_free(void *table, int index) } } - + -#ifdef CONFIG_SMP void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int index) { unsigned long pgf = (unsigned long)table; @@ -395,12 +394,6 @@ void __tlb_remove_table(void *_table) - + return pgtable_free(table, index); } -#else @@ -118,7 +118,7 @@ index 75483b40fcb1..2bf7e1b4fd82 100644 - return pgtable_free(table, index); -} -#endif - + #ifdef CONFIG_PROC_FS atomic_long_t direct_pages_count[MMU_PAGE_COUNT]; -- diff --git a/a/content_digest b/N1/content_digest index af6b853..d881afb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -48,15 +48,15 @@ "--- a/arch/powerpc/include/asm/book3s/32/pgalloc.h\n" "+++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h\n" "@@ -49,7 +49,6 @@ static inline void pgtable_free(void *table, unsigned index_size)\n" - " \n" + "\n" " #define get_hugepd_cache_index(x) (x)\n" - " \n" + "\n" "-#ifdef CONFIG_SMP\n" " static inline void pgtable_free_tlb(struct mmu_gather *tlb,\n" " \t\t\t\t void *table, int shift)\n" " {\n" "@@ -66,13 +65,6 @@ static inline void __tlb_remove_table(void *_table)\n" - " \n" + "\n" " \tpgtable_free(table, shift);\n" " }\n" "-#else\n" @@ -66,7 +66,7 @@ "-\tpgtable_free(table, shift);\n" "-}\n" "-#endif\n" - " \n" + "\n" " static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,\n" " \t\t\t\t unsigned long address)\n" "diff --git a/arch/powerpc/include/asm/book3s/64/pgalloc.h b/arch/powerpc/include/asm/book3s/64/pgalloc.h\n" @@ -81,16 +81,16 @@ " extern void __tlb_remove_table(void *_table);\n" "-#endif\n" " void pte_frag_destroy(void *pte_frag);\n" - " \n" + "\n" " static inline pgd_t *radix__pgd_alloc(struct mm_struct *mm)\n" "diff --git a/arch/powerpc/include/asm/nohash/pgalloc.h b/arch/powerpc/include/asm/nohash/pgalloc.h\n" "index 332b13b4ecdb..29c43665a753 100644\n" "--- a/arch/powerpc/include/asm/nohash/pgalloc.h\n" "+++ b/arch/powerpc/include/asm/nohash/pgalloc.h\n" "@@ -46,7 +46,6 @@ static inline void pgtable_free(void *table, int shift)\n" - " \n" + "\n" " #define get_hugepd_cache_index(x)\t(x)\n" - " \n" + "\n" "-#ifdef CONFIG_SMP\n" " static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)\n" " {\n" @@ -98,7 +98,7 @@ "@@ -64,13 +63,6 @@ static inline void __tlb_remove_table(void *_table)\n" " \tpgtable_free(table, shift);\n" " }\n" - " \n" + "\n" "-#else\n" "-static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)\n" "-{\n" @@ -116,13 +116,13 @@ "@@ -378,7 +378,6 @@ static inline void pgtable_free(void *table, int index)\n" " \t}\n" " }\n" - " \n" + "\n" "-#ifdef CONFIG_SMP\n" " void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int index)\n" " {\n" " \tunsigned long pgf = (unsigned long)table;\n" "@@ -395,12 +394,6 @@ void __tlb_remove_table(void *_table)\n" - " \n" + "\n" " \treturn pgtable_free(table, index);\n" " }\n" "-#else\n" @@ -131,10 +131,10 @@ "-\treturn pgtable_free(table, index);\n" "-}\n" "-#endif\n" - " \n" + "\n" " #ifdef CONFIG_PROC_FS\n" " atomic_long_t direct_pages_count[MMU_PAGE_COUNT];\n" "-- \n" 2.24.1 -ca361243cad0e5b1531f3dad94cf87a16e9d50aa27525d4843e2e21c6ba61e93 +136799b241ab9f85b205fe55edc29b7b024314922dc90e6b4a11ac46a34dcf32
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.