diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /arch/i386/kernel/apic.c | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/apic.c')
| -rw-r--r-- | arch/i386/kernel/apic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 013b85df18c6..3d4b2f3d116a 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
| @@ -1341,6 +1341,14 @@ int __init APIC_init_uniprocessor (void) | |||
| 1341 | 1341 | ||
| 1342 | connect_bsp_APIC(); | 1342 | connect_bsp_APIC(); |
| 1343 | 1343 | ||
| 1344 | /* | ||
| 1345 | * Hack: In case of kdump, after a crash, kernel might be booting | ||
| 1346 | * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid | ||
| 1347 | * might be zero if read from MP tables. Get it from LAPIC. | ||
| 1348 | */ | ||
| 1349 | #ifdef CONFIG_CRASH_DUMP | ||
| 1350 | boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID)); | ||
| 1351 | #endif | ||
| 1344 | phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid); | 1352 | phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid); |
| 1345 | 1353 | ||
| 1346 | setup_local_APIC(); | 1354 | setup_local_APIC(); |