diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 833ab71427a030d1168c2c06e8e889992bad608f..55ae913ccf0101b427dd665a613b4eb4251d1232 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5136,6 +5136,11 @@ EXPORT_SYMBOL_GPL(hugetlb_get_hstate);
  */
 struct page *hugetlb_alloc_hugepage(int nid)
 {
+	VM_WARN_ON(nid < 0 || nid >= MAX_NUMNODES);
+
+	if (nid == NUMA_NO_NODE)
+		nid = numa_mem_id();
+
 	return alloc_huge_page_node(&default_hstate, nid);
 }
 EXPORT_SYMBOL_GPL(hugetlb_alloc_hugepage);