Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[deliverable/linux.git] / arch / powerpc / mm / hugetlbpage.c

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 119d18611500f4ccde99916b1012bfba0b9f1039..7372ee13eb1e43e6bcf7cd955b01452dbc696add 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -81,6 +81,13 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
        if (! new)
                return -ENOMEM;
 
+       /*
+        * Make sure other cpus find the hugepd set only after a
+        * properly initialized page table is visible to them.
+        * For more details look for comment in __pte_alloc().
+        */
+       smp_wmb();
+
        spin_lock(&mm->page_table_lock);
 #ifdef CONFIG_PPC_FSL_BOOK3E
        /*