2 files changed, 13 insertions, 0 deletions

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 5b9601715289..343a87fa78b5 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -299,6 +299,7 @@ int map_page(unsigned long va, phys_addr_t pa, int flags)
                 set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT,
                                                      __pgprot(flags)));
         }
+        smp_wmb();
         return err;
 }
 
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 02e8681fb865..755138218e04 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -153,6 +153,18 @@ int map_kernel_page(unsigned long ea, unsigned long pa, int flags)
                 }
 #endif /* !CONFIG_PPC_MMU_NOHASH */
         }
+
+#ifdef CONFIG_PPC_BOOK3E_64
+        /*
+         * With hardware tablewalk, a sync is needed to ensure that
+         * subsequent accesses see the PTE we just wrote.  Unlike userspace
+         * mappings, we can't tolerate spurious faults, so make sure
+         * the new PTE will be seen the first time.
+         */
+        mb();
+#else
+        smp_wmb();
+#endif
         return 0;
 }