diff for duplicates of <20200414153455.21744-6-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 6308fe7..e1f8e83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif @@ -225,3 +225,8 @@ index d637b4ea3147..ca760f6cb18f 100644 pmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node); -- 2.25.1 + +_______________________________________________ +kvmarm mailing list +kvmarm@lists.cs.columbia.edu +https://lists.cs.columbia.edu/mailman/listinfo/kvmarm diff --git a/a/content_digest b/N1/content_digest index f612ddf..b20068d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -61,7 +61,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +78,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +95,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +106,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -266,6 +266,11 @@ " \t\tif (pud_none(*pud)) {\n" " \t\t\tpmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node);\n" "-- \n" - 2.25.1 + "2.25.1\n" + "\n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +f17f402d4180e1d629fed09249fb5a56a6e6966f82271b790f78eae7c9104bda
diff --git a/a/1.txt b/N2/1.txt index 6308fe7..522f447 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif diff --git a/a/content_digest b/N2/content_digest index f612ddf..9ad8d09 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -28,16 +28,7 @@ Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> openrisc@lists.librecores.org Stafford Horne <shorne@gmail.com> - Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> - linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + " Guan Xuetao <gxt@p>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -61,7 +52,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +69,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +86,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +97,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -268,4 +259,4 @@ "-- \n" 2.25.1 -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +16fbbcf7e7c1c58ad782f6ad20f104a25b7a3b9b3807908da70e2e65a0024f82
diff --git a/a/1.txt b/N3/1.txt index 6308fe7..522f447 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif diff --git a/a/content_digest b/N3/content_digest index f612ddf..c55684a 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,43 +1,8 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" - "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" - "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org - Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org - Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> - Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp - Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> - Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> - linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + "Subject\0[OpenRISC] [PATCH v4 05/14] ia64: add support for folded p4d page tables\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -61,7 +26,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +43,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +60,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +71,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -268,4 +233,4 @@ "-- \n" 2.25.1 -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +9c69110de820bcbe64fde2f2cbfa4293db14c0eee4729e563e1e45c8b5534776
diff --git a/a/1.txt b/N4/1.txt index 6308fe7..522f447 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif diff --git a/a/content_digest b/N4/content_digest index f612ddf..5b56a92 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,13 +1,12 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org Geert Uytterhoeven <geert+renesas@glider.be> linux-sh@vger.kernel.org - Benjamin Herrenschmidt <benh@kernel.crashing.org> linux-mm@kvack.org Paul Mackerras <paulus@samba.org> linux-hexagon@vger.kernel.org @@ -21,20 +20,21 @@ Ley Foon Tan <ley.foon.tan@intel.com> Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> + Julien Thierry <julien.thierry.kdev@gmail.com> uclinux-h8-devel@lists.sourceforge.jp Fenghua Yu <fenghua.yu@intel.com> Arnd Bergmann <arnd@arndb.de> + Suzuki K Poulose <suzuki.poulose@arm.com> kvm-ppc@vger.kernel.org Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> openrisc@lists.librecores.org Stafford Horne <shorne@gmail.com> Guan Xuetao <gxt@pku.edu.cn> linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> + James Morse <james.morse@arm.com> nios2-dev@lists.rocketboards.org linuxppc-dev@lists.ozlabs.org " Mike Rapoport <rppt@kernel.org>\0" @@ -61,7 +61,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +78,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +95,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +106,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -268,4 +268,4 @@ "-- \n" 2.25.1 -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +3d0ca53e48a337e63e57cf9022c135f57b2d23f321b1dc8e1ece1cf20c611a4a
diff --git a/a/1.txt b/N5/1.txt index 6308fe7..230e881 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif @@ -225,3 +225,9 @@ index d637b4ea3147..ca760f6cb18f 100644 pmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node); -- 2.25.1 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N5/content_digest index f612ddf..36bf5bd 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -21,9 +21,11 @@ Ley Foon Tan <ley.foon.tan@intel.com> Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> + Julien Thierry <julien.thierry.kdev@gmail.com> uclinux-h8-devel@lists.sourceforge.jp Fenghua Yu <fenghua.yu@intel.com> Arnd Bergmann <arnd@arndb.de> + Suzuki K Poulose <suzuki.poulose@arm.com> kvm-ppc@vger.kernel.org Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> openrisc@lists.librecores.org @@ -34,6 +36,7 @@ Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> linux-kernel@vger.kernel.org + James Morse <james.morse@arm.com> Michael Ellerman <mpe@ellerman.id.au> nios2-dev@lists.rocketboards.org linuxppc-dev@lists.ozlabs.org @@ -61,7 +64,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +81,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +98,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +109,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -266,6 +269,12 @@ " \t\tif (pud_none(*pud)) {\n" " \t\t\tpmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node);\n" "-- \n" - 2.25.1 + "2.25.1\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +8bccdf97b7814b002e8220a30b4108a28360ce426294b3de62976992385ca576
diff --git a/a/1.txt b/N6/1.txt index 6308fe7..522f447 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -19,7 +19,7 @@ index f4c491044882..2a3050345099 100644 +++ b/arch/ia64/include/asm/pgalloc.h @@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 static inline void -pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud) +p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud) @@ -36,7 +36,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END; #define pud_page(pud) virt_to_page((pud_val(pud) + PAGE_OFFSET)) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (!ia64_phys_addr_valid(pgd_val(pgd))) -#define pgd_present(pgd) (pgd_val(pgd) != 0UL) @@ -53,7 +53,7 @@ index 0e7b645b76c6..787b0a91d255 100644 /* @@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) - #if CONFIG_PGTABLE_LEVELS = 4 + #if CONFIG_PGTABLE_LEVELS == 4 /* Find an entry in the second-level page table.. */ #define pud_offset(dir,addr) \ - ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) @@ -64,7 +64,7 @@ index 0e7b645b76c6..787b0a91d255 100644 @@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr; - #if CONFIG_PGTABLE_LEVELS = 3 + #if CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #endif diff --git a/a/content_digest b/N6/content_digest index f612ddf..0f64d6d 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,43 +1,46 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 05/14] ia64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:46 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:46 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0Arnd Bergmann <arnd@arndb.de>" Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp + Christophe Leroy <christophe.leroy@c-s.fr> Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> + Geert Uytterhoeven <geert+renesas@glider.be> Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> + James Morse <james.morse@arm.com> + Jonas Bonn <jonas@southpole.se> + Julien Thierry <julien.thierry.kdev@gmail.com> + Ley Foon Tan <ley.foon.tan@intel.com> + Marc Zyngier <maz@kernel.org> + Michael Ellerman <mpe@ellerman.id.au> + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + Stafford Horne <shorne@gmail.com> + Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> + Suzuki K Poulose <suzuki.poulose@arm.com> Tony Luck <tony.luck@intel.com> + Will Deacon <will@kernel.org> Yoshinori Sato <ysato@users.sourceforge.jp> + kvmarm@lists.cs.columbia.edu + kvm-ppc@vger.kernel.org + linux-arch@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-hexagon@vger.kernel.org + linux-ia64@vger.kernel.org linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org + linux-mm@kvack.org linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + linux-sh@vger.kernel.org + nios2-dev@lists.rocketboards.org + openrisc@lists.librecores.org + uclinux-h8-devel@lists.sourceforge.jp + Mike Rapoport <rppt@kernel.org> + " Mike Rapoport <rppt@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -61,7 +64,7 @@ "+++ b/arch/ia64/include/asm/pgalloc.h\n" "@@ -36,9 +36,9 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " static inline void\n" "-pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)\n" "+p4d_populate(struct mm_struct *mm, p4d_t * p4d_entry, pud_t * pud)\n" @@ -78,7 +81,7 @@ "@@ -283,12 +283,12 @@ extern unsigned long VMALLOC_END;\n" " #define pud_page(pud)\t\t\tvirt_to_page((pud_val(pud) + PAGE_OFFSET))\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" "-#define pgd_none(pgd)\t\t\t(!pgd_val(pgd))\n" "-#define pgd_bad(pgd)\t\t\t(!ia64_phys_addr_valid(pgd_val(pgd)))\n" "-#define pgd_present(pgd)\t\t(pgd_val(pgd) != 0UL)\n" @@ -95,7 +98,7 @@ " \n" " /*\n" "@@ -386,7 +386,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)\n" - " #if CONFIG_PGTABLE_LEVELS = 4\n" + " #if CONFIG_PGTABLE_LEVELS == 4\n" " /* Find an entry in the second-level page table.. */\n" " #define pud_offset(dir,addr) \\\n" "-\t((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))\n" @@ -106,7 +109,7 @@ "@@ -580,10 +580,9 @@ extern struct page *zero_page_memmap_ptr;\n" " \n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 3\n" + " #if CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" " #endif\n" @@ -268,4 +271,4 @@ "-- \n" 2.25.1 -e8d9c7ee6d86ef8eadc8df66d988d20d399fe155d5993f6dbc955019d85ba411 +daa276409e95fefa5176452b246161d2dfe200084e1f1b1aa9b7a2749e71647f
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.