diff for duplicates of <20200216081843.28670-5-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 85cfa2f..66719f4 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 b01d68a2d5d9..4808f58220ac 100644 pmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node); -- 2.24.0 + +_______________________________________________ +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 17319c7..f93bb7b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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" "@@ -388,7 +388,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 @@ "@@ -582,10 +582,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.24.0 + "2.24.0\n" + "\n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +938db3f0b6a1df86ee4fdf240310d14dd6e22e16422eab5d273b44beb014905f
diff --git a/a/1.txt b/N2/1.txt index 85cfa2f..5d645ff 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 17319c7..33e9f12 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,43 +1,27 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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\0Andrew Morton <akpm@linux-foundation.org>" + Arnd 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> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + 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> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + " Stafford Horne <shorne@gmail.com>Stefan Kristiansson <s>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -61,7 +45,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 +62,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 +79,7 @@ " \n" " /*\n" "@@ -388,7 +388,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 +90,7 @@ "@@ -582,10 +582,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 +252,4 @@ "-- \n" 2.24.0 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +c502a79a84e0f1f6f2a50731cf2b33dfc63a21e6f1b9b1f545c932a6b18a65f1
diff --git a/a/1.txt b/N3/1.txt index 85cfa2f..5d645ff 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 17319c7..b8643ef 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,43 +1,46 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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\0Andrew Morton <akpm@linux-foundation.org>" + Arnd 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> - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> + 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-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" "@@ -388,7 +388,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 @@ "@@ -582,10 +582,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.24.0 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +c487dd4806bdb94145fc99d66af5908bbd1625afe62c3636ca6525b855b30e7c
diff --git a/a/1.txt b/N4/1.txt index 85cfa2f..5d645ff 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 17319c7..24a1c9e 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,43 +1,28 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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\0Andrew Morton <akpm@linux-foundation.org>" + Arnd 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> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + 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> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + Stafford Horne <shorne@gmail.com> + " Stefan Kristiansson <s>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -61,7 +46,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 +63,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 +80,7 @@ " \n" " /*\n" "@@ -388,7 +388,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 +91,7 @@ "@@ -582,10 +582,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 +253,4 @@ "-- \n" 2.24.0 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +ab14066ab885f43e1ac452c804faf62d41ba5bb475d2c42d2b3967fc465e591e
diff --git a/a/1.txt b/N5/1.txt index 85cfa2f..5d645ff 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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/N5/content_digest index 17319c7..76714eb 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,43 +1,8 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" - "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" - "To\0linux-kernel@vger.kernel.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> - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + "Subject\0[OpenRISC] [PATCH v2 04/13] ia64: add support for folded p4d page tables\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\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" "@@ -388,7 +388,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 @@ "@@ -582,10 +582,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.24.0 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +3e8c255a4a2bf9a04824b18f4d159e57c535fd3ab4a276c218a30e5e0dc911ba
diff --git a/a/1.txt b/N6/1.txt index 85cfa2f..5d645ff 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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 17319c7..aaaa882 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,13 +1,12 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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,19 +20,20 @@ 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> - Michael Ellerman <mpe@ellerman.id.au> + James Morse <james.morse@arm.com> nios2-dev@lists.rocketboards.org Andrew Morton <akpm@linux-foundation.org> linuxppc-dev@lists.ozlabs.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" "@@ -388,7 +388,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 @@ "@@ -582,10 +582,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.24.0 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +66d1705ed5cfb0ff646ed2a8b5a2b382713f091024363f8790bb6321f06c3588
diff --git a/a/1.txt b/N7/1.txt index 85cfa2f..bdd9412 100644 --- a/a/1.txt +++ b/N7/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 d602e7c622db..c87f789bc914 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 d602e7c622db..c87f789bc914 100644 /* @@ -388,7 +388,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 d602e7c622db..c87f789bc914 100644 @@ -582,10 +582,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 b01d68a2d5d9..4808f58220ac 100644 pmd = memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node); -- 2.24.0 + + +_______________________________________________ +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/N7/content_digest index 17319c7..00d9c29 100644 --- a/a/content_digest +++ b/N7/content_digest @@ -1,7 +1,7 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 04/13] ia64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:34 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:34 +0200\0" "To\0linux-kernel@vger.kernel.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 @@ -33,6 +35,7 @@ Christophe Leroy <christophe.leroy@c-s.fr> Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> + James Morse <james.morse@arm.com> Michael Ellerman <mpe@ellerman.id.au> nios2-dev@lists.rocketboards.org Andrew Morton <akpm@linux-foundation.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" "@@ -388,7 +388,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 @@ "@@ -582,10 +582,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.24.0 + "2.24.0\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 -45fcefe323e06b6f154879e90ecd6d6f85bacba734a061aa1c7d07c99f89c21c +2e26a7bbc3619c91f8184d63a2eea393a429222e8d212863649c1f9a5178ec75
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.