commit 4dfb88ca9b66690d21030ccacc1cca73db90655e
author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Fri Apr 29 23:26:20 2016 +1000
committer Michael Ellerman <mpe@ellerman.id.au> Wed May 11 21:53:52 2016 +1000
tree ca8c4679b65760e65be940c372c5946aefa9c448
parent a2f41eb99208adf4732529c4df1fd12b39f4c333

powerpc/mm: Update pte filter for radix

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/mm/pgtable.c

diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index db277b6..88a3075 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -82,6 +82,9 @@
 
 static pte_t set_pte_filter(pte_t pte)
 {
+	if (radix_enabled())
+		return pte;
+
 	pte = __pte(pte_val(pte) & ~_PAGE_HPTEFLAGS);
 	if (pte_looks_normal(pte) && !(cpu_has_feature(CPU_FTR_COHERENT_ICACHE) ||
 				       cpu_has_feature(CPU_FTR_NOEXECUTE))) {