ia64/xen-unstable

changeset 4754:0e46eeba11c0

bitkeeper revision 1.1389.5.4 (4277b86czqxlqC40s7HyXb3A25SZkQ)

Fix domU SMP build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 03 17:44:12 2005 +0000 (2005-05-03)
parents 7bb775134a42
children 6521227a93d4
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	Tue May 03 17:24:41 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c	Tue May 03 17:44:12 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 -unsigned int __initdata maxcpus = NR_CPUS;
     1.8 +extern unsigned int maxcpus;
     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	Tue May 03 17:24:41 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Tue May 03 17:44:12 2005 +0000
     2.3 @@ -67,6 +67,8 @@ 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 @@ -785,8 +787,6 @@ static void __init parse_cmdline_early (
    2.13  		 * maxcpus=N at enumeration-time can be used to disable HT.
    2.14  		 */
    2.15  		else if (!memcmp(from, "maxcpus=", 8)) {
    2.16 -			extern unsigned int maxcpus;
    2.17 -
    2.18  			maxcpus = simple_strtoul(from + 8, NULL, 0);
    2.19  		}
    2.20  #endif