From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH] x86: allow SRAT to be used on 32-bit systems with memory beyond 4G Date: Wed, 24 Feb 2010 13:44:15 +0000 Message-ID: <4B853B3F0200007800031005@vpn.id2.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartB49E773F.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartB49E773F.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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]; } =20 -int valid_numa_range(unsigned long start, unsigned long end, int node) +int valid_numa_range(u64 start, u64 end, int node) { int i; =20 @@ -74,7 +74,7 @@ int valid_numa_range(unsigned long start return 0; } =20 -static __init int conflicting_memblks(unsigned long start, unsigned long = end) +static __init int conflicting_memblks(u64 start, u64 end) { int i; =20 --- 2010-02-19.orig/xen/include/asm-x86/numa.h 2010-01-13 18:58:11.0000000= 00 +0100 +++ 2010-02-19/xen/include/asm-x86/numa.h 2010-02-24 14:26:56.0000000= 00 +0100 @@ -76,11 +76,11 @@ static inline __attribute__((pure)) int=20 #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ NODE_DATA(nid)->node_spanned_pages) =20 -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 =20 void srat_parse_regions(u64 addr); --=__PartB49E773F.0__= Content-Type: text/plain; name="xen-srat-32bit.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-srat-32bit.patch" Signed-off-by: Jan Beulich =0A=0A--- 2010-02-19.orig/x= en/arch/x86/srat.c 2010-01-13 18:58:11.000000000 +0100=0A+++ = 2010-02-19/xen/arch/x86/srat.c 2010-02-24 14:25:50.000000000 +0100=0A@@ = -59,7 +59,7 @@ __devinit int setup_node(int pxm)=0A return pxm2node[pxm= ];=0A }=0A =0A-int valid_numa_range(unsigned long start, unsigned long = end, int node)=0A+int valid_numa_range(u64 start, u64 end, int node)=0A = {=0A int i;=0A =0A@@ -74,7 +74,7 @@ int valid_numa_range(unsigned long = start=0A return 0;=0A }=0A =0A-static __init int conflicting_memblks= (unsigned long start, unsigned long end)=0A+static __init int conflicting_m= emblks(u64 start, u64 end)=0A {=0A int i;=0A =0A--- 2010-02-19.orig/xe= n/include/asm-x86/numa.h 2010-01-13 18:58:11.000000000 +0100=0A+++ = 2010-02-19/xen/include/asm-x86/numa.h 2010-02-24 14:26:56.000000000 = +0100=0A@@ -76,11 +76,11 @@ static inline __attribute__((pure)) int =0A = #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \=0A = NODE_DATA(nid)->node_spanned_pages)=0A =0A-extern int = valid_numa_range(unsigned long start, unsigned long end, int node);=0A+exte= rn int valid_numa_range(u64 start, u64 end, int node);=0A #else=0A #define = init_cpu_to_node() do {} while (0)=0A #define clear_node_cpumask(cpu) do = {} while (0)=0A-#define valid_numa_range(start, end, node) {return = 1;}=0A+#define valid_numa_range(start, end, node) 1=0A #endif=0A =0A void = srat_parse_regions(u64 addr);=0A --=__PartB49E773F.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartB49E773F.0__=--