1 files changed, 9 insertions, 5 deletions

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index b2740c67e172..5b22ba0b58bc 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -201,9 +201,8 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags)
         /*
          * We can't allow hardware to update hpte bits. Hence always
          * set 'R' bit and set 'C' if it is a write fault
-         * Memory coherence is always enabled
          */
-        rflags |=  HPTE_R_R | HPTE_R_M;
+        rflags |=  HPTE_R_R;
 
         if (pteflags & _PAGE_DIRTY)
                 rflags |= HPTE_R_C;
@@ -213,10 +212,15 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags)
 
         if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_TOLERANT)
                 rflags |= HPTE_R_I;
-        if ((pteflags & _PAGE_CACHE_CTL ) == _PAGE_NON_IDEMPOTENT)
+        else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_NON_IDEMPOTENT)
                 rflags |= (HPTE_R_I | HPTE_R_G);
-        if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_SAO)
-                rflags |= (HPTE_R_I | HPTE_R_W);
+        else if ((pteflags & _PAGE_CACHE_CTL) == _PAGE_SAO)
+                rflags |= (HPTE_R_W | HPTE_R_I | HPTE_R_M);
+        else
+                /*
+                 * Add memory coherence if cache inhibited is not set
+                 */
+                rflags |= HPTE_R_M;
 
         return rflags;
 }