powerpc/mm: don't use _PAGE_EXEC in book3s/32

chleroy · mpe · commit d81e6f8b7c66 · 2018-10-14T18:04:09.000+11:00
book3s/32 doesn't define _PAGE_EXEC, so no need to use it.

All other platforms define _PAGE_EXEC so no need to check
it is not NUL when not book3s/32.

Reviewed-by: Aneesh Kumar K.V &lt;aneesh.kumar@linux.ibm.com&gt;
Signed-off-by: Christophe Leroy &lt;christophe.leroy@c-s.fr&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
@@ -234,7 +234,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
 					   int psize)
 {
 	unsigned long set = pte_val(entry) &
-		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);
+		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW);
 	unsigned long clr = ~pte_val(entry) & _PAGE_RO;
 
 	pte_update(ptep, clr, set);
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
@@ -73,7 +73,7 @@ static struct page *maybe_pte_to_page(pte_t pte)
 	return page;
 }
 
-#if defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0
+#ifdef CONFIG_PPC_BOOK3S
 
 /* Server-style MMU handles coherency when hashing if HW exec permission
  * is supposed per page (currently 64-bit only). If not, then, we always
@@ -106,7 +106,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,
 	return pte;
 }
 
-#else /* defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0 */
+#else /* CONFIG_PPC_BOOK3S */
 
 /* Embedded type MMU with HW exec support. This is a bit more complicated
  * as we don't have two bits to spare for _PAGE_EXEC and _PAGE_HWEXEC so
@@ -179,7 +179,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,
 	return __pte(pte_val(pte) | _PAGE_EXEC);
 }
 
-#endif /* !(defined(CONFIG_PPC_STD_MMU) || _PAGE_EXEC == 0) */
+#endif /* CONFIG_PPC_BOOK3S */
 
 /*
  * set_pte stores a linux PTE into the linux page table.

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,`
`234`	`234`	`int psize)`
`235`	`235`	`{`
`236`	`236`	`unsigned long set = pte_val(entry) &`
`237`		`- (_PAGE_DIRTY \| _PAGE_ACCESSED \| _PAGE_RW \| _PAGE_EXEC);`
	`237`	`+ (_PAGE_DIRTY \| _PAGE_ACCESSED \| _PAGE_RW);`
`238`	`238`	`unsigned long clr = ~pte_val(entry) & _PAGE_RO;`
`239`	`239`
`240`	`240`	`pte_update(ptep, clr, set);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static struct page *maybe_pte_to_page(pte_t pte)`
`73`	`73`	`return page;`
`74`	`74`	`}`
`75`	`75`
`76`		`-#if defined(CONFIG_PPC_STD_MMU) \|\| _PAGE_EXEC == 0`
	`76`	`+#ifdef CONFIG_PPC_BOOK3S`
`77`	`77`
`78`	`78`	`/* Server-style MMU handles coherency when hashing if HW exec permission`
`79`	`79`	`* is supposed per page (currently 64-bit only). If not, then, we always`
`@@ -106,7 +106,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,`
`106`	`106`	`return pte;`
`107`	`107`	`}`
`108`	`108`
`109`		`-#else /* defined(CONFIG_PPC_STD_MMU) \|\| _PAGE_EXEC == 0 */`
	`109`	`+#else /* CONFIG_PPC_BOOK3S */`
`110`	`110`
`111`	`111`	`/* Embedded type MMU with HW exec support. This is a bit more complicated`
`112`	`112`	`* as we don't have two bits to spare for _PAGE_EXEC and _PAGE_HWEXEC so`
`@@ -179,7 +179,7 @@ static pte_t set_access_flags_filter(pte_t pte, struct vm_area_struct *vma,`
`179`	`179`	`return __pte(pte_val(pte) \| _PAGE_EXEC);`
`180`	`180`	`}`
`181`	`181`
`182`		`-#endif /* !(defined(CONFIG_PPC_STD_MMU) \|\| _PAGE_EXEC == 0) */`
	`182`	`+#endif /* CONFIG_PPC_BOOK3S */`
`183`	`183`
`184`	`184`	`/*`
`185`	`185`	`* set_pte stores a linux PTE into the linux page table.`