[Xen-changelog] Fix domU SMP build.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1427, 2005/05/03 18:44:12+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix domU SMP build.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 mpparse.c |    2 +-
 setup.c   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c    2005-05-03 
14:04:44 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c    2005-05-03 
14:04:44 -04:00
@@ -37,7 +37,7 @@
 
 /* Have we found an MP table */
 int smp_found_config;
-unsigned int __initdata maxcpus = NR_CPUS;
+extern unsigned int maxcpus;
 
 /*
  * Various Linux-internal data structures created from the
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-03 
14:04:44 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-03 
14:04:44 -04:00
@@ -67,6 +67,8 @@
 
 int disable_pse __initdata = 0;
 
+unsigned int __initdata maxcpus = NR_CPUS;
+
 /*
  * Machine setup..
  */
@@ -785,8 +787,6 @@
                 * maxcpus=N at enumeration-time can be used to disable HT.
                 */
                else if (!memcmp(from, "maxcpus=", 8)) {
-                       extern unsigned int maxcpus;
-
                        maxcpus = simple_strtoul(from + 8, NULL, 0);
                }
 #endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog