aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h1
-rw-r--r--include/acpi/processor.h7
2 files changed, 4 insertions, 4 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 7d1ce40e201e..d53908438e95 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -372,6 +372,7 @@ struct acpi_device {
372 void *driver_data; 372 void *driver_data;
373 struct device dev; 373 struct device dev;
374 unsigned int physical_node_count; 374 unsigned int physical_node_count;
375 unsigned int dep_unmet;
375 struct list_head physical_node_list; 376 struct list_head physical_node_list;
376 struct mutex physical_node_lock; 377 struct mutex physical_node_lock;
377 void (*remove)(struct acpi_device *); 378 void (*remove)(struct acpi_device *);
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 9b9b6f29bbf3..3ca9b751f122 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -67,9 +67,6 @@ struct acpi_processor_cx {
67}; 67};
68 68
69struct acpi_processor_power { 69struct acpi_processor_power {
70 struct acpi_processor_cx *state;
71 unsigned long bm_check_timestamp;
72 u32 default_state;
73 int count; 70 int count;
74 struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; 71 struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER];
75 int timer_broadcast_on_state; 72 int timer_broadcast_on_state;
@@ -313,11 +310,13 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
313#endif /* CONFIG_CPU_FREQ */ 310#endif /* CONFIG_CPU_FREQ */
314 311
315/* in processor_core.c */ 312/* in processor_core.c */
316void acpi_processor_set_pdc(acpi_handle handle);
317int acpi_get_apicid(acpi_handle, int type, u32 acpi_id); 313int acpi_get_apicid(acpi_handle, int type, u32 acpi_id);
318int acpi_map_cpuid(int apic_id, u32 acpi_id); 314int acpi_map_cpuid(int apic_id, u32 acpi_id);
319int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id); 315int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
320 316
317/* in processor_pdc.c */
318void acpi_processor_set_pdc(acpi_handle handle);
319
321/* in processor_throttling.c */ 320/* in processor_throttling.c */
322int acpi_processor_tstate_has_changed(struct acpi_processor *pr); 321int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
323int acpi_processor_get_throttling_info(struct acpi_processor *pr); 322int acpi_processor_get_throttling_info(struct acpi_processor *pr);