[Xen-changelog] [xen-unstable] x86 numa: Fix i386 to not do bogus mfn_to_virt(alloc_boot_pages(...))

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267131654 0
# Node ID 5db0a9bd6a500233194283206ee1cbd8cc52f47d
# Parent  f6d7b66fdb80d2e61c14cee1859fb482f9b66839
x86 numa: Fix i386 to not do bogus mfn_to_virt(alloc_boot_pages(...))

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/numa.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

diff -r f6d7b66fdb80 -r 5db0a9bd6a50 xen/arch/x86/numa.c
--- a/xen/arch/x86/numa.c       Thu Feb 25 20:56:43 2010 +0000
+++ b/xen/arch/x86/numa.c       Thu Feb 25 21:00:54 2010 +0000
@@ -30,7 +30,7 @@ struct node_data node_data[MAX_NUMNODES]
 
 /* Mapping from pdx to node id */
 int memnode_shift;
-static typeof(*memnodemap) _memnodemap[2];
+static typeof(*memnodemap) _memnodemap[64];
 unsigned long memnodemapsize;
 u8 *memnodemap;
 
@@ -90,6 +90,7 @@ static int __init populate_memnodemap(co
 
 static int __init allocate_cachealigned_memnodemap(void)
 {
+#ifndef __i386__
        unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap));
        unsigned long mfn = alloc_boot_pages(size, 1);
 
@@ -108,6 +109,13 @@ static int __init allocate_cachealigned_
        memnodemapsize = size / sizeof(*memnodemap);
 
        return 0;
+#else
+       printk(KERN_ERR
+              "Memory to Node hash needs %lu entries, got only %zu\n",
+              memnodemapsize, ARRAY_SIZE(_memnodemap));
+       memnodemapsize = 0;
+       return -1;
+#endif
 }
 
 /*

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