debuggers.hg

changeset 21028:5db0a9bd6a50

x86 numa: Fix i386 to not do bogus mfn_to_virt(alloc_boot_pages(...))

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Feb 25 21:00:54 2010 +0000 (2010-02-25)
parents f6d7b66fdb80
children 94535cc63835
files xen/arch/x86/numa.c
line diff
     1.1 --- a/xen/arch/x86/numa.c	Thu Feb 25 20:56:43 2010 +0000
     1.2 +++ b/xen/arch/x86/numa.c	Thu Feb 25 21:00:54 2010 +0000
     1.3 @@ -30,7 +30,7 @@ struct node_data node_data[MAX_NUMNODES]
     1.4  
     1.5  /* Mapping from pdx to node id */
     1.6  int memnode_shift;
     1.7 -static typeof(*memnodemap) _memnodemap[2];
     1.8 +static typeof(*memnodemap) _memnodemap[64];
     1.9  unsigned long memnodemapsize;
    1.10  u8 *memnodemap;
    1.11  
    1.12 @@ -90,6 +90,7 @@ static int __init populate_memnodemap(co
    1.13  
    1.14  static int __init allocate_cachealigned_memnodemap(void)
    1.15  {
    1.16 +#ifndef __i386__
    1.17  	unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap));
    1.18  	unsigned long mfn = alloc_boot_pages(size, 1);
    1.19  
    1.20 @@ -108,6 +109,13 @@ static int __init allocate_cachealigned_
    1.21  	memnodemapsize = size / sizeof(*memnodemap);
    1.22  
    1.23  	return 0;
    1.24 +#else
    1.25 +	printk(KERN_ERR
    1.26 +	       "Memory to Node hash needs %lu entries, got only %zu\n",
    1.27 +	       memnodemapsize, ARRAY_SIZE(_memnodemap));
    1.28 +	memnodemapsize = 0;
    1.29 +	return -1;
    1.30 +#endif
    1.31  }
    1.32  
    1.33  /*