[Xen-changelog] Revert gratuitous Linux changes and fix maxcpus mess properly.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1429, 2005/05/04 10:41:40+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Revert gratuitous Linux changes and fix maxcpus mess properly.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 mpparse.c |    2 +-
 setup.c   |    6 +++---
 2 files changed, 4 insertions(+), 4 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-05 
07:02:56 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c    2005-05-05 
07:02:56 -04:00
@@ -37,7 +37,7 @@
 
 /* Have we found an MP table */
 int smp_found_config;
-extern unsigned int maxcpus;
+unsigned int __initdata maxcpus = NR_CPUS;
 
 /*
  * 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-05 
07:02:56 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-05 
07:02:56 -04:00
@@ -67,8 +67,6 @@
 
 int disable_pse __initdata = 0;
 
-unsigned int __initdata maxcpus = NR_CPUS;
-
 /*
  * Machine setup..
  */
@@ -781,12 +779,14 @@
                        noexec_setup(from + 7);
 
 
-#ifdef  CONFIG_X86_SMP
+#ifdef  CONFIG_X86_MPPARSE
                /*
                 * If the BIOS enumerates physical processors before logical,
                 * 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