Merge branch 'akpm-current/current'

[karo-tx-linux.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index fd16b767dd68cbf32e5a9f8f48903fcaad185800..e9a3c0fe368dcaed48abb4863103b203ce0a51dd 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3284,9 +3284,6 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                }
        }
 
-       /* THP should already have been handled */
-       BUG_ON(pmd_numa(*pmd));
-
        /*
         * Use __pte_alloc instead of pte_alloc_map, because we can't
         * run pte_offset_map on the pmd, if an huge pmd could