[Xen-changelog] [xen-unstable] Only use domain_to_node() on non-null domain pointer.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1215361378 -3600
# Node ID 8606ff75779f6f6c65d8b1dd4a9edfdff03378bf
# Parent  4bdc3de246c3d9660187db9bf7ec328668771d4b
Only use domain_to_node() on non-null domain pointer.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/common/page_alloc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 4bdc3de246c3 -r 8606ff75779f xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   Sat Jul 05 14:43:37 2008 +0100
+++ b/xen/common/page_alloc.c   Sun Jul 06 17:22:58 2008 +0100
@@ -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));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog