debuggers.hg

changeset 21024:3d8e819241b0

x86: allow SRAT to be used on 32-bit systems with memory beyond 4G

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Feb 24 20:27:56 2010 +0000 (2010-02-24)
parents e4851c5b7d00
children 12a5ca59b175
files xen/arch/x86/srat.c xen/include/asm-x86/numa.h
line diff
     1.1 --- a/xen/arch/x86/srat.c	Wed Feb 24 20:26:08 2010 +0000
     1.2 +++ b/xen/arch/x86/srat.c	Wed Feb 24 20:27:56 2010 +0000
     1.3 @@ -59,7 +59,7 @@ int pxm_to_node(int pxm)
     1.4  	return pxm2node[pxm];
     1.5  }
     1.6  
     1.7 -int valid_numa_range(unsigned long start, unsigned long end, int node)
     1.8 +int valid_numa_range(u64 start, u64 end, int node)
     1.9  {
    1.10  	int i;
    1.11  
    1.12 @@ -74,7 +74,7 @@ int valid_numa_range(unsigned long start
    1.13  	return 0;
    1.14  }
    1.15  
    1.16 -static __init int conflicting_memblks(unsigned long start, unsigned long end)
    1.17 +static __init int conflicting_memblks(u64 start, u64 end)
    1.18  {
    1.19  	int i;
    1.20  
     2.1 --- a/xen/include/asm-x86/numa.h	Wed Feb 24 20:26:08 2010 +0000
     2.2 +++ b/xen/include/asm-x86/numa.h	Wed Feb 24 20:27:56 2010 +0000
     2.3 @@ -76,11 +76,11 @@ static inline __attribute__((pure)) int 
     2.4  #define node_end_pfn(nid)       (NODE_DATA(nid)->node_start_pfn + \
     2.5  				 NODE_DATA(nid)->node_spanned_pages)
     2.6  
     2.7 -extern int valid_numa_range(unsigned long start, unsigned long end, int node);
     2.8 +extern int valid_numa_range(u64 start, u64 end, int node);
     2.9  #else
    2.10  #define init_cpu_to_node() do {} while (0)
    2.11  #define clear_node_cpumask(cpu) do {} while (0)
    2.12 -#define valid_numa_range(start, end, node) {return 1;}
    2.13 +#define valid_numa_range(start, end, node) 1
    2.14  #endif
    2.15  
    2.16  void srat_parse_regions(u64 addr);