diff options
| author | attilio <attilio@FreeBSD.org> | 2012-10-09 12:22:43 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2012-10-09 12:22:43 +0000 |
| commit | 3212891c92af5f2d7d3d162066a3fc5b39195996 (patch) | |
| tree | c05b3d1bedc331d22044ddd50f075c6b6a619735 /sys/amd64/amd64/mp_machdep.c | |
| parent | 8747a46991f804159ec832961138fbafc8489e41 (diff) | |
| download | FreeBSD-src-3212891c92af5f2d7d3d162066a3fc5b39195996.zip FreeBSD-src-3212891c92af5f2d7d3d162066a3fc5b39195996.tar.gz | |
Reverts r234074,234105,234564,234723,234989,235231-235232 and part of
r234247.
Use, instead, the static intializer introduced in r239923 for x86 and
sparc64 intr_cpus, unwinding the code to the initial version.
Reviewed by: marius
Diffstat (limited to 'sys/amd64/amd64/mp_machdep.c')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 7276ce1..d2e4aad 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -784,6 +784,8 @@ init_secondary(void) * We tell the I/O APIC code about all the CPUs we want to receive * interrupts. If we don't want certain CPUs to receive IRQs we * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void set_interrupt_apic_ids(void) @@ -794,6 +796,8 @@ set_interrupt_apic_ids(void) apic_id = cpu_apic_ids[i]; if (apic_id == -1) continue; + if (cpu_info[apic_id].cpu_bsp) + continue; if (cpu_info[apic_id].cpu_disabled) continue; |
