Only use domain_to_node() on non-null domain pointer.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 8502d77999064c9e85dd4d2ea7f16d24e334e617..d497fdfd57bcf2de863bb0403069b66f6aed5db3 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -792,7 +792,7 @@ struct page_info *alloc_domheap_pages(
 
     ASSERT(!in_irq());
 
-    if ( node == NUMA_NO_NODE )
+    if ( (node == NUMA_NO_NODE) && (d != NULL) )
         node = domain_to_node(d);
 
     bits = domain_clamp_alloc_bitsize(d, bits ? : (BITS_PER_LONG+PAGE_SHIFT));