ia64/xen-unstable

changeset 4756:4978be644202

bitkeeper revision 1.1389.5.6 (427898d4o1E6hrH0W0u6j1RHmjFkVw)

Revert gratuitous Linux changes and fix maxcpus mess properly.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Wed May 04 09:41:40 2005 +0000 (2005-05-04)
parents 6521227a93d4
children 2529059abc03
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c	Wed May 04 08:46:22 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c	Wed May 04 09:41:40 2005 +0000
     1.3 @@ -37,7 +37,7 @@
     1.4  
     1.5  /* Have we found an MP table */
     1.6  int smp_found_config;
     1.7 -extern unsigned int maxcpus;
     1.8 +unsigned int __initdata maxcpus = NR_CPUS;
     1.9  
    1.10  /*
    1.11   * Various Linux-internal data structures created from the
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Wed May 04 08:46:22 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Wed May 04 09:41:40 2005 +0000
     2.3 @@ -67,8 +67,6 @@ static struct notifier_block xen_panic_b
     2.4  
     2.5  int disable_pse __initdata = 0;
     2.6  
     2.7 -unsigned int __initdata maxcpus = NR_CPUS;
     2.8 -
     2.9  /*
    2.10   * Machine setup..
    2.11   */
    2.12 @@ -781,12 +779,14 @@ static void __init parse_cmdline_early (
    2.13  			noexec_setup(from + 7);
    2.14  
    2.15  
    2.16 -#ifdef  CONFIG_X86_SMP
    2.17 +#ifdef  CONFIG_X86_MPPARSE
    2.18  		/*
    2.19  		 * If the BIOS enumerates physical processors before logical,
    2.20  		 * maxcpus=N at enumeration-time can be used to disable HT.
    2.21  		 */
    2.22  		else if (!memcmp(from, "maxcpus=", 8)) {
    2.23 +			extern unsigned int maxcpus;
    2.24 +
    2.25  			maxcpus = simple_strtoul(from + 8, NULL, 0);
    2.26  		}
    2.27  #endif