diff --git a/[refs] b/[refs] index 0339f56fc8bd..da599ac07ec3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b9d705297b273657923518dbea2377cd03532ed +refs/heads/master: 1ba6e0b50b479cbadb8f05ebde3020da9ac87201 diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index 35c66a269bcc..cd24aa562144 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -1364,6 +1364,8 @@ static int __split_huge_page_map(struct page *page, BUG_ON(page_mapcount(page) != 1); if (!pmd_young(*pmd)) entry = pte_mkold(entry); + if (pmd_numa(*pmd)) + entry = pte_mknuma(entry); pte = pte_offset_map(&_pmd, haddr); BUG_ON(!pte_none(*pte)); set_pte_at(mm, haddr, pte, entry);