From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 28 Oct 2013 00:11:24 +0000 (+0100)
Subject: Merge branch 'acpi-processor'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fbc4d63744b21ed6814ce768672531500bd3f14;p=linux-beck.git

Merge branch 'acpi-processor'

* acpi-processor:
  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
---

3fbc4d63744b21ed6814ce768672531500bd3f14
diff --cc drivers/acpi/acpi_processor.c
index 357abdc1406a,da428929c1a4..3c1d6b0c09a4
--- a/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