summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-28 04:11:24 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-28 04:11:24 +0400
commit3fbc4d63744b21ed6814ce768672531500bd3f14 (patch)
tree661663d6d5e577e0a4462e89ee8d693298c7eb44 /include/acpi
parent8e32e47dbb98fd24e4c541753427a576e6ab5bb3 (diff)
parent764d022133979f9d9a179152cd89717e9752c61a (diff)
downloadlinux-3fbc4d63744b21ed6814ce768672531500bd3f14.tar.xz
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
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/processor.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 66096d06925e..7816e45f5d5a 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -199,6 +199,7 @@ struct acpi_processor_flags {
struct acpi_processor {
acpi_handle handle;
u32 acpi_id;
+ u32 apic_id;
u32 id;
u32 pblk;
int performance_platform_limit;
@@ -314,6 +315,8 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
/* in processor_core.c */
void acpi_processor_set_pdc(acpi_handle handle);
+int acpi_get_apicid(acpi_handle, int type, u32 acpi_id);
+int acpi_map_cpuid(int apic_id, u32 acpi_id);
int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
/* in processor_throttling.c */