powerpc/mm: don't do tlbie for updatepp request with NO HPTE fault

[karo-tx-linux.git] / arch / powerpc / mm / hash_native_64.c

diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 13700911b522b1cfdc8518c4566fd3b7ab859f4e..9c4880ddecd63f06e0f4b2b45aded0b57b47e940 100644 (file)
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -283,11 +283,11 @@ static long native_hpte_remove(unsigned long hpte_group)
 
 static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                 unsigned long vpn, int bpsize,
-                                int apsize, int ssize, int local)
+                                int apsize, int ssize, unsigned long flags)
 {
        struct hash_pte *hptep = htab_address + slot;
        unsigned long hpte_v, want_v;
-       int ret = 0;
+       int ret = 0, local = 0;
 
        want_v = hpte_encode_avpn(vpn, bpsize, ssize);
 
@@ -322,8 +322,15 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                }
                native_unlock_hpte(hptep);
        }
-       /* Ensure it is out of the tlb too. */
-       tlbie(vpn, bpsize, apsize, ssize, local);
+
+       if (flags & HPTE_LOCAL_UPDATE)
+               local = 1;
+       /*
+        * Ensure it is out of the tlb too if it is not a nohpte fault
+        */
+       if (!(flags & HPTE_NOHPTE_UPDATE))
+               tlbie(vpn, bpsize, apsize, ssize, local);
+
        return ret;
 }