diff options
author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
---|---|---|
committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/arch/i386/setup.c | |
parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/arch/i386/setup.c')
-rw-r--r-- | xen/arch/i386/setup.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xen/arch/i386/setup.c b/xen/arch/i386/setup.c index f4f62c2b02..1e5f35a73e 100644 --- a/xen/arch/i386/setup.c +++ b/xen/arch/i386/setup.c @@ -292,7 +292,7 @@ void __init start_of_day(void) extern void initialize_keytable(); extern void initialize_serial(void); extern void initialize_keyboard(void); - + extern int opt_nosmp; unsigned long low_mem_size; /* @@ -327,7 +327,11 @@ void __init start_of_day(void) #ifndef CONFIG_SMP APIC_init_uniprocessor(); #else - smp_boot_cpus(); /* + if( opt_nosmp ) + APIC_init_uniprocessor(); + else + smp_boot_cpus(); + /* * Does loads of stuff, including kicking the local * APIC, and the IO APIC after other CPUs are booted. * Each IRQ is preferably handled by IO-APIC, but |