powerpc/mm: Fix WARN_ON with THP NUMA migration

[linux-2.6-block.git] / arch / powerpc / mm / pgtable.c

diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index ca4b1f7ac39d0064091aa1dbe885ad441cba28e6..010e1c616cb2a15147b9335f9f929b45d281e0c6 100644 (file)
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -184,7 +184,7 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
         * Make sure hardware valid bit is not set. We don't do
         * tlb flush for this update.
         */
-       VM_WARN_ON(pte_hw_valid(*ptep));
+       VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep));
 
        /* Add the pte bit when trying to set a pte */
        pte = pte_mkpte(pte);