# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267043276 0
# Node ID 3d8e819241b088376bcf3e55a4cc51eebdfdaf62
# Parent e4851c5b7d0081a7e799018522ca64b3a7bcc776
x86: allow SRAT to be used on 32-bit systems with memory beyond 4G
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/srat.c | 4 ++--
xen/include/asm-x86/numa.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -r e4851c5b7d00 -r 3d8e819241b0 xen/arch/x86/srat.c
--- a/xen/arch/x86/srat.c Wed Feb 24 20:26:08 2010 +0000
+++ b/xen/arch/x86/srat.c Wed Feb 24 20:27:56 2010 +0000
@@ -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;
diff -r e4851c5b7d00 -r 3d8e819241b0 xen/include/asm-x86/numa.h
--- a/xen/include/asm-x86/numa.h Wed Feb 24 20:26:08 2010 +0000
+++ b/xen/include/asm-x86/numa.h Wed Feb 24 20:27:56 2010 +0000
@@ -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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|