Merge branch 'acpi-processor-next' into linux-next

* acpi-processor-next:
  ACPI / processor: fixed a brace coding style issue
  ACPI / processor: Remove outdated comments
  ACPI / processor: remove unnecessary if (!pr) check
  ACPI / processor: remove some dead code in acpi_processor_get_info()
  x86 / ACPI: simplify _acpi_map_lsapic()
  ACPI / processor: use apic_id and remove duplicated _MAT evaluation
  ACPI / processor: Introduce apic_id in struct processor to save parsed APIC id

diff --cc drivers/acpi/acpi_processor.c
index 357abdc1406acbf29b5e6fe3010f0f731fb41c88,da428929c1a42855b482762078edbc1c80b1c9f1..3c1d6b0c09a4b7d1eeeb9347a7c743d1c7487988
--- 1/drivers/acpi/acpi_processor.c
--- 2/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@@ -219,12 -215,8 +215,9 @@@ static int acpi_processor_get_info(stru
        int cpu_index, device_declaration = 0;
        acpi_status status = AE_OK;
        static int cpu0_initialized;
 +      unsigned long long value;
  
-       if (num_online_cpus() > 1)
-               errata.smp = TRUE;
- 
-       acpi_processor_errata(pr);
+       acpi_processor_errata();
  
        /*
         * Check to see if we have bus mastering arbitration control.  This