diff for duplicates of <20200414153455.21744-9-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 4bf7215..c48ac1b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1008,3 +1008,8 @@ index 7af840c0fc93..64be69cb0b13 100644 printf("No valid PUD\n"); -- 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 619c757..69f9f41 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -95,8 +95,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +323,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +576,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +596,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +687,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +704,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1049,6 +1049,11 @@ " \tif (pud_none(*pudp)) {\n" " \t\tprintf(\"No valid PUD\\n\");\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 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +7d954898c9195c6640ed57761db75f44eec78a799c6f780073ccb0efe7b72d40
diff --git a/a/1.txt b/N2/1.txt index 4bf7215..366e416 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N2/content_digest index 619c757..8489b45 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +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" @@ -95,8 +86,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +314,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +567,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +587,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +678,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +695,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1051,4 +1042,4 @@ "-- \n" 2.25.1 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +da56867f6001240dcf757cf9c7df5107c7a864d2c7ac852ba987dad2cf9b9024
diff --git a/a/1.txt b/N3/1.txt index 4bf7215..366e416 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N3/content_digest index 619c757..92d2097 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +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 08/14] powerpc: add support for folded p4d page tables\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +0300\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -95,8 +60,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +288,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +541,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +561,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +652,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +669,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1051,4 +1016,4 @@ "-- \n" 2.25.1 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +fb81bd5e16a4f9ab47fd422b3236dca58cfdede2a253deedcaaec174a942864a
diff --git a/a/1.txt b/N4/1.txt index 4bf7215..366e416 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N4/content_digest index 619c757..f30fc74 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +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" @@ -95,8 +95,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +323,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +576,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +596,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +687,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +704,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1051,4 +1051,4 @@ "-- \n" 2.25.1 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +67b88d3c7251815be8a0084345772e23c7b47ecf22e2a2620b027af603c46b99
diff --git a/a/1.txt b/N5/1.txt index 4bf7215..7069745 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1008,3 +1008,9 @@ index 7af840c0fc93..64be69cb0b13 100644 printf("No valid PUD\n"); -- 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 619c757..cfa4a1a 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +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 @@ -95,8 +98,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +326,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +579,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +599,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +690,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +707,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1049,6 +1052,12 @@ " \tif (pud_none(*pudp)) {\n" " \t\tprintf(\"No valid PUD\\n\");\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 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +d8a213d89ffa705918398e1fabdb2760344c18798c52af34521b12f841c25be1
diff --git a/a/1.txt b/N6/1.txt index 4bf7215..366e416 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -53,8 +53,8 @@ index 6fc4520092c7..73ad038ed10b 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -281,11 +281,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -534,7 +534,7 @@ index 8f9edf07063a..97891ca0d428 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -554,7 +554,7 @@ index 8f9edf07063a..97891ca0d428 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -645,7 +645,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -662,7 +662,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N6/content_digest index 619c757..c7ef535 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 08/14] powerpc: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:49 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:49 +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" @@ -95,8 +98,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -323,11 +326,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -576,7 +579,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -115,6 +117,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -596,7 +599,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -174,6 +178,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -687,7 +690,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -704,7 +707,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1051,4 +1054,4 @@ "-- \n" 2.25.1 -a0f48509c77383debec585e2a6086ee3eac09f1ae13917f771c25923b56ce6d6 +3133a4aaa9a808287d42fe206e8610759d15609dea04ee2854c69dcf7035ab86
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.