diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-01 09:41:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 09:41:06 +0300 |
| commit | 05b93c19d50af2bd0d30fc000d817418ae8d33f1 (patch) | |
| tree | dbfbd3f3bc13789e6450112c2013d7a2b042bdb9 /arch/x86/kernel/smpboot.c | |
| parent | 24d86f59093b0bcb3756cdf47f2db10ff4e90dbb (diff) | |
| parent | 0c183d92b20b5c84ca655b45ef57b3318b83eb9e (diff) | |
| download | linux-05b93c19d50af2bd0d30fc000d817418ae8d33f1.tar.xz | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index dcbd45ad8db6..95d6fc549ad5 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1407,15 +1407,17 @@ __init void prefill_possible_map(void) /* No boot processor was found in mptable or ACPI MADT */ if (!num_processors) { - int apicid = boot_cpu_physical_apicid; - int cpu = hard_smp_processor_id(); + if (boot_cpu_has(X86_FEATURE_APIC)) { + int apicid = boot_cpu_physical_apicid; + int cpu = hard_smp_processor_id(); - pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu); + pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu); - /* Make sure boot cpu is enumerated */ - if (apic->cpu_present_to_apicid(0) == BAD_APICID && - apic->apic_id_valid(apicid)) - generic_processor_info(apicid, boot_cpu_apic_version); + /* Make sure boot cpu is enumerated */ + if (apic->cpu_present_to_apicid(0) == BAD_APICID && + apic->apic_id_valid(apicid)) + generic_processor_info(apicid, boot_cpu_apic_version); + } if (!num_processors) num_processors = 1; |