diff options
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acglobal.h | 4 | ||||
-rw-r--r-- | include/acpi/acmacros.h | 6 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 5 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 2 | ||||
-rw-r--r-- | include/acpi/acpi_numa.h | 1 | ||||
-rw-r--r-- | include/acpi/acpiosxf.h | 7 | ||||
-rw-r--r-- | include/acpi/processor.h | 13 |
7 files changed, 22 insertions, 16 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 347a911d823..47a1fd8f2d8 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -117,10 +117,6 @@ extern u32 acpi_dbg_layer; | |||
117 | 117 | ||
118 | extern u32 acpi_gbl_nesting_level; | 118 | extern u32 acpi_gbl_nesting_level; |
119 | 119 | ||
120 | /* Event counters */ | ||
121 | |||
122 | ACPI_EXTERN u32 acpi_gpe_count; | ||
123 | |||
124 | /* Support for dynamic control method tracing mechanism */ | 120 | /* Support for dynamic control method tracing mechanism */ |
125 | 121 | ||
126 | ACPI_EXTERN u32 acpi_gbl_original_dbg_level; | 122 | ACPI_EXTERN u32 acpi_gbl_original_dbg_level; |
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index 45662f6dbdb..99d171c87c8 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
@@ -486,7 +486,7 @@ | |||
486 | #define ACPI_FUNCTION_NAME(name) | 486 | #define ACPI_FUNCTION_NAME(name) |
487 | #endif | 487 | #endif |
488 | 488 | ||
489 | #ifdef DEBUG_FUNC_TRACE | 489 | #ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE |
490 | 490 | ||
491 | #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ | 491 | #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ |
492 | acpi_ut_trace(ACPI_DEBUG_PARAMETERS) | 492 | acpi_ut_trace(ACPI_DEBUG_PARAMETERS) |
@@ -565,7 +565,7 @@ | |||
565 | 565 | ||
566 | #endif /* ACPI_SIMPLE_RETURN_MACROS */ | 566 | #endif /* ACPI_SIMPLE_RETURN_MACROS */ |
567 | 567 | ||
568 | #else /* !DEBUG_FUNC_TRACE */ | 568 | #else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */ |
569 | 569 | ||
570 | #define ACPI_FUNCTION_TRACE(a) | 570 | #define ACPI_FUNCTION_TRACE(a) |
571 | #define ACPI_FUNCTION_TRACE_PTR(a,b) | 571 | #define ACPI_FUNCTION_TRACE_PTR(a,b) |
@@ -584,7 +584,7 @@ | |||
584 | #define return_UINT32(s) return(s) | 584 | #define return_UINT32(s) return(s) |
585 | #define return_PTR(s) return(s) | 585 | #define return_PTR(s) return(s) |
586 | 586 | ||
587 | #endif /* DEBUG_FUNC_TRACE */ | 587 | #endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */ |
588 | 588 | ||
589 | /* Conditional execution */ | 589 | /* Conditional execution */ |
590 | 590 | ||
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index fb7171b1bd2..2f1c68c7a72 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -321,6 +321,11 @@ struct acpi_bus_event { | |||
321 | 321 | ||
322 | extern struct kobject *acpi_kobj; | 322 | extern struct kobject *acpi_kobj; |
323 | extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); | 323 | extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); |
324 | void acpi_bus_private_data_handler(acpi_handle, u32, void *); | ||
325 | int acpi_bus_get_private_data(acpi_handle, void **); | ||
326 | extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32); | ||
327 | extern int register_acpi_notifier(struct notifier_block *); | ||
328 | extern int unregister_acpi_notifier(struct notifier_block *); | ||
324 | /* | 329 | /* |
325 | * External Functions | 330 | * External Functions |
326 | */ | 331 | */ |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index f85f77a538a..9757a040a50 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -48,6 +48,7 @@ | |||
48 | #define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN" | 48 | #define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN" |
49 | #define ACPI_VIDEO_HID "LNXVIDEO" | 49 | #define ACPI_VIDEO_HID "LNXVIDEO" |
50 | #define ACPI_BAY_HID "LNXIOBAY" | 50 | #define ACPI_BAY_HID "LNXIOBAY" |
51 | #define ACPI_DOCK_HID "LNXDOCK" | ||
51 | 52 | ||
52 | /* -------------------------------------------------------------------------- | 53 | /* -------------------------------------------------------------------------- |
53 | PCI | 54 | PCI |
@@ -73,7 +74,6 @@ struct pci_bus; | |||
73 | 74 | ||
74 | acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); | 75 | acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); |
75 | int acpi_pci_bind(struct acpi_device *device); | 76 | int acpi_pci_bind(struct acpi_device *device); |
76 | int acpi_pci_unbind(struct acpi_device *device); | ||
77 | int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id, | 77 | int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id, |
78 | struct pci_bus *bus); | 78 | struct pci_bus *bus); |
79 | 79 | ||
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index 62c5ee4311d..17397267217 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h | |||
@@ -15,7 +15,6 @@ extern int pxm_to_node(int); | |||
15 | extern int node_to_pxm(int); | 15 | extern int node_to_pxm(int); |
16 | extern void __acpi_map_pxm_to_node(int, int); | 16 | extern void __acpi_map_pxm_to_node(int, int); |
17 | extern int acpi_map_pxm_to_node(int); | 17 | extern int acpi_map_pxm_to_node(int); |
18 | extern void __cpuinit acpi_unmap_pxm_to_node(int); | ||
19 | 18 | ||
20 | #endif /* CONFIG_ACPI_NUMA */ | 19 | #endif /* CONFIG_ACPI_NUMA */ |
21 | #endif /* __ACP_NUMA_H */ | 20 | #endif /* __ACP_NUMA_H */ |
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index ca882b8e7d1..022a5fd80c8 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -181,6 +181,9 @@ acpi_os_install_interrupt_handler(u32 gsi, | |||
181 | acpi_status | 181 | acpi_status |
182 | acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine); | 182 | acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine); |
183 | 183 | ||
184 | void acpi_os_gpe_count(u32 gpe_number); | ||
185 | void acpi_os_fixed_event_count(u32 fixed_event_number); | ||
186 | |||
184 | /* | 187 | /* |
185 | * Threads and Scheduling | 188 | * Threads and Scheduling |
186 | */ | 189 | */ |
@@ -239,8 +242,8 @@ acpi_status acpi_os_validate_interface(char *interface); | |||
239 | acpi_status acpi_osi_invalidate(char* interface); | 242 | acpi_status acpi_osi_invalidate(char* interface); |
240 | 243 | ||
241 | acpi_status | 244 | acpi_status |
242 | acpi_os_validate_address(u8 space_id, | 245 | acpi_os_validate_address(u8 space_id, acpi_physical_address address, |
243 | acpi_physical_address address, acpi_size length); | 246 | acpi_size length, char *name); |
244 | 247 | ||
245 | u64 acpi_os_get_timer(void); | 248 | u64 acpi_os_get_timer(void); |
246 | 249 | ||
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 6e253b5b0f3..cdc8004cfd1 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
6 | #include <linux/cpuidle.h> | 6 | #include <linux/cpuidle.h> |
7 | 7 | #include <linux/thermal.h> | |
8 | #include <asm/acpi.h> | 8 | #include <asm/acpi.h> |
9 | 9 | ||
10 | #define ACPI_PROCESSOR_BUSY_METRIC 10 | 10 | #define ACPI_PROCESSOR_BUSY_METRIC 10 |
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | #define ACPI_CSTATE_SYSTEMIO (0) | 35 | #define ACPI_CSTATE_SYSTEMIO (0) |
36 | #define ACPI_CSTATE_FFH (1) | 36 | #define ACPI_CSTATE_FFH (1) |
37 | #define ACPI_CSTATE_HALT (2) | ||
37 | 38 | ||
38 | /* Power Management */ | 39 | /* Power Management */ |
39 | 40 | ||
@@ -64,7 +65,7 @@ struct acpi_processor_cx { | |||
64 | u8 valid; | 65 | u8 valid; |
65 | u8 type; | 66 | u8 type; |
66 | u32 address; | 67 | u32 address; |
67 | u8 space_id; | 68 | u8 entry_method; |
68 | u8 index; | 69 | u8 index; |
69 | u32 latency; | 70 | u32 latency; |
70 | u32 latency_ticks; | 71 | u32 latency_ticks; |
@@ -176,6 +177,8 @@ struct acpi_processor_throttling { | |||
176 | u32 address; | 177 | u32 address; |
177 | u8 duty_offset; | 178 | u8 duty_offset; |
178 | u8 duty_width; | 179 | u8 duty_width; |
180 | u8 tsd_valid_flag; | ||
181 | unsigned int shared_type; | ||
179 | struct acpi_processor_tx states[ACPI_PROCESSOR_MAX_THROTTLING]; | 182 | struct acpi_processor_tx states[ACPI_PROCESSOR_MAX_THROTTLING]; |
180 | }; | 183 | }; |
181 | 184 | ||
@@ -218,7 +221,7 @@ struct acpi_processor { | |||
218 | struct acpi_processor_performance *performance; | 221 | struct acpi_processor_performance *performance; |
219 | struct acpi_processor_throttling throttling; | 222 | struct acpi_processor_throttling throttling; |
220 | struct acpi_processor_limit limit; | 223 | struct acpi_processor_limit limit; |
221 | 224 | struct thermal_cooling_device *cdev; | |
222 | /* the _PDC objects for this processor, if any */ | 225 | /* the _PDC objects for this processor, if any */ |
223 | struct acpi_object_list *pdc; | 226 | struct acpi_object_list *pdc; |
224 | }; | 227 | }; |
@@ -316,7 +319,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) | |||
316 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); | 319 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); |
317 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); | 320 | extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); |
318 | extern struct file_operations acpi_processor_throttling_fops; | 321 | extern struct file_operations acpi_processor_throttling_fops; |
319 | 322 | extern void acpi_processor_throttling_init(void); | |
320 | /* in processor_idle.c */ | 323 | /* in processor_idle.c */ |
321 | int acpi_processor_power_init(struct acpi_processor *pr, | 324 | int acpi_processor_power_init(struct acpi_processor *pr, |
322 | struct acpi_device *device); | 325 | struct acpi_device *device); |
@@ -330,7 +333,7 @@ extern struct cpuidle_driver acpi_idle_driver; | |||
330 | /* in processor_thermal.c */ | 333 | /* in processor_thermal.c */ |
331 | int acpi_processor_get_limit_info(struct acpi_processor *pr); | 334 | int acpi_processor_get_limit_info(struct acpi_processor *pr); |
332 | extern struct file_operations acpi_processor_limit_fops; | 335 | extern struct file_operations acpi_processor_limit_fops; |
333 | 336 | extern struct thermal_cooling_device_ops processor_cooling_ops; | |
334 | #ifdef CONFIG_CPU_FREQ | 337 | #ifdef CONFIG_CPU_FREQ |
335 | void acpi_thermal_cpufreq_init(void); | 338 | void acpi_thermal_cpufreq_init(void); |
336 | void acpi_thermal_cpufreq_exit(void); | 339 | void acpi_thermal_cpufreq_exit(void); |