diff for duplicates of <20200308105444.GE13982@linux.ibm.com>

diff --git a/a/1.txt b/N1/1.txt
index 786f7aa..2ca831a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -83,8 +83,8 @@ index 2781ebf6add4..876d1528c2cf 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);
@@ -311,11 +311,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)
  
@@ -564,7 +564,7 @@ index dd1bea45325c..fc3d0b0460b0 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;
 @@ -114,6 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,
@@ -584,7 +584,7 @@ index dd1bea45325c..fc3d0b0460b0 100644
 +	pudp = pud_alloc(&init_mm, p4dp, ea);
  	if (!pudp)
  		return -ENOMEM;
- 	if (map_page_size = PUD_SIZE) {
+ 	if (map_page_size == PUD_SIZE) {
 @@ -173,6 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,
  {
  	unsigned long idx;
@@ -675,7 +675,7 @@ index 73d4873fc7f8..43d463f20fc3 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;
@@ -692,7 +692,7 @@ index 73d4873fc7f8..43d463f20fc3 100644
 +		pu = pud_alloc(mm, p4, addr);
  		if (!pu)
  			return NULL;
- 		if (pshift = PUD_SHIFT)
+ 		if (pshift == PUD_SHIFT)
 @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz
  #else
  	if (pshift >= PGDIR_SHIFT) {
@@ -1050,3 +1050,8 @@ index e8c84d265602..0e1cc7275566 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 6483582..53c1f0a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,7 +3,7 @@
  "ref\020200306200016.6f3865ada0daa68b645fe5d7@linux-foundation.org\0"
  "From\0Mike Rapoport <rppt@linux.ibm.com>\0"
  "Subject\0Re: [PATCH v3 07/14] powerpc/32: drop get_pteptr()\0"
- "Date\0Sun, 08 Mar 2020 10:54:44 +0000\0"
+ "Date\0Sun, 8 Mar 2020 12:54:44 +0200\0"
  "To\0Andrew Morton <akpm@linux-foundation.org>\0"
  "Cc\0Rich Felker <dalias@libc.org>"
   linux-ia64@vger.kernel.org
@@ -126,8 +126,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"
@@ -354,11 +354,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"
@@ -607,7 +607,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"
  "@@ -114,6 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n"
@@ -627,7 +627,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"
  "@@ -173,6 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n"
  " {\n"
  " \tunsigned long idx;\n"
@@ -718,7 +718,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"
@@ -735,7 +735,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"
  "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n"
  " #else\n"
  " \tif (pshift >= PGDIR_SHIFT) {\n"
@@ -1092,6 +1092,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
 
-e30d2ac7f438b2e0585c71db9c7ad4db182f5e18ef94a7fec3c661d022a15b71
+ce6ace669d83a0e4c8c2c364881062425bcbedd1bd306dd1f543cfa3033d3fc1
