Signed-off-by: Jan Beulich --- 2010-02-19.orig/xen/arch/x86/srat.c 2010-01-13 18:58:11.000000000 +0100 +++ 2010-02-19/xen/arch/x86/srat.c 2010-02-24 14:25:50.000000000 +0100 @@ -59,7 +59,7 @@ __devinit int setup_node(int pxm) return pxm2node[pxm]; } -int valid_numa_range(unsigned long start, unsigned long end, int node) +int valid_numa_range(u64 start, u64 end, int node) { int i; @@ -74,7 +74,7 @@ int valid_numa_range(unsigned long start return 0; } -static __init int conflicting_memblks(unsigned long start, unsigned long end) +static __init int conflicting_memblks(u64 start, u64 end) { int i; --- 2010-02-19.orig/xen/include/asm-x86/numa.h 2010-01-13 18:58:11.000000000 +0100 +++ 2010-02-19/xen/include/asm-x86/numa.h 2010-02-24 14:26:56.000000000 +0100 @@ -76,11 +76,11 @@ static inline __attribute__((pure)) int #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ NODE_DATA(nid)->node_spanned_pages) -extern int valid_numa_range(unsigned long start, unsigned long end, int node); +extern int valid_numa_range(u64 start, u64 end, int node); #else #define init_cpu_to_node() do {} while (0) #define clear_node_cpumask(cpu) do {} while (0) -#define valid_numa_range(start, end, node) {return 1;} +#define valid_numa_range(start, end, node) 1 #endif void srat_parse_regions(u64 addr);