mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1389.5.51 (4280b7c3zTKZxZNOTWdOco0qdNV2yQ)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
commit
2ca7eac3f3
3 files changed
+2
-8
No files matched your search
@@ -1267,9 +1267,11 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
|
||||
#if 0
|
||||
if (nmi_watchdog == NMI_LOCAL_APIC)
|
||||
check_nmi_watchdog();
|
||||
#endif
|
||||
|
||||
smpboot_setup_io_apic();
|
||||
|
||||
#if 0
|
||||
setup_boot_APIC_clock();
|
||||
|
||||
/*
|
||||
|
||||
@@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_reset_vector(void)
|
||||
|
||||
static inline void smpboot_setup_io_apic(void)
|
||||
{
|
||||
#if 1
|
||||
printk("smpboot_setup_io_apic\n");
|
||||
#else
|
||||
/*
|
||||
* Here we can be sure that there is an IO-APIC in the system. Let's
|
||||
* go and set it up:
|
||||
*/
|
||||
if (!skip_ioapic_setup && nr_ioapics)
|
||||
setup_IO_APIC();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_reset_vector(void)
|
||||
|
||||
static inline void smpboot_setup_io_apic(void)
|
||||
{
|
||||
#if 1
|
||||
printk("smpboot_setup_io_apic\n");
|
||||
#else
|
||||
/*
|
||||
* Here we can be sure that there is an IO-APIC in the system. Let's
|
||||
* go and set it up:
|
||||
*/
|
||||
if (!skip_ioapic_setup && nr_ioapics)
|
||||
setup_IO_APIC();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||