diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:52:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:52:48 +0200 |
| commit | 8989e1cc35736b03948748343fb5ba42eb3bbfb8 (patch) | |
| tree | 44feb210db2812c90761095c5e7411531d27ba83 /drivers/acpi/acpi_processor.c | |
| parent | 7e1c1a82f505e79a85a822a377bd3369e676ac2d (diff) | |
| parent | 46ba51ea8f8639da32c55744b35479fdfb4e7232 (diff) | |
Merge branch 'acpi-config'
* acpi-config:
ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC
ACPI: Don't use acpi_lapic in ACPI core code
ACPI: add config for BIOS table scan
Diffstat (limited to 'drivers/acpi/acpi_processor.c')
| -rw-r--r-- | drivers/acpi/acpi_processor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 1c085742644f..1fdf5e07a1c7 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -268,7 +268,7 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->apic_id = apic_id; cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id); - if (!cpu0_initialized && !acpi_lapic) { + if (!cpu0_initialized && !acpi_has_cpu_in_madt()) { cpu0_initialized = 1; /* Handle UP system running SMP kernel, with no LAPIC in MADT */ if ((cpu_index == -1) && (num_online_cpus() == 1)) |