diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-02-24 20:27:56 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-02-24 20:27:56 +0000 |
| commit | e1ea3ce4f2473c604214981778dff06cb0a092f5 (patch) | |
| tree | 91bcaa44c350ba42a72c3c91ff3ce31a1a0d51e9 | |
| parent | ec619d3c3e391b33c9e9f7ba049cb0d323707306 (diff) | |
| download | xen-e1ea3ce4f2473c604214981778dff06cb0a092f5.tar.gz xen-e1ea3ce4f2473c604214981778dff06cb0a092f5.tar.bz2 xen-e1ea3ce4f2473c604214981778dff06cb0a092f5.zip | |
x86: allow SRAT to be used on 32-bit systems with memory beyond 4G
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/arch/x86/srat.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-x86/numa.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 452f6534eb..9da11f7b0e 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -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, unsigned long end, int node) return 0; } -static __init int conflicting_memblks(unsigned long start, unsigned long end) +static __init int conflicting_memblks(u64 start, u64 end) { int i; diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 7e39b849d8..96155a6987 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -76,11 +76,11 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) #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); |