aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
-rw-r--r--include/acpi/processor.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index fb7171b1bd22..504af20b10c1 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -321,6 +321,8 @@ struct acpi_bus_event {
321 321
322extern struct kobject *acpi_kobj; 322extern struct kobject *acpi_kobj;
323extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); 323extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
324void acpi_bus_private_data_handler(acpi_handle, u32, void *);
325int acpi_bus_get_private_data(acpi_handle, void **);
324/* 326/*
325 * External Functions 327 * External Functions
326 */ 328 */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index f6d7c508917c..0c75a0b9c565 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
@@ -219,7 +219,7 @@ struct acpi_processor {
219 struct acpi_processor_performance *performance; 219 struct acpi_processor_performance *performance;
220 struct acpi_processor_throttling throttling; 220 struct acpi_processor_throttling throttling;
221 struct acpi_processor_limit limit; 221 struct acpi_processor_limit limit;
222 222 struct thermal_cooling_device *cdev;
223 /* the _PDC objects for this processor, if any */ 223 /* the _PDC objects for this processor, if any */
224 struct acpi_object_list *pdc; 224 struct acpi_object_list *pdc;
225}; 225};
@@ -331,7 +331,7 @@ extern struct cpuidle_driver acpi_idle_driver;
331/* in processor_thermal.c */ 331/* in processor_thermal.c */
332int acpi_processor_get_limit_info(struct acpi_processor *pr); 332int acpi_processor_get_limit_info(struct acpi_processor *pr);
333extern struct file_operations acpi_processor_limit_fops; 333extern struct file_operations acpi_processor_limit_fops;
334 334extern struct thermal_cooling_device_ops processor_cooling_ops;
335#ifdef CONFIG_CPU_FREQ 335#ifdef CONFIG_CPU_FREQ
336void acpi_thermal_cpufreq_init(void); 336void acpi_thermal_cpufreq_init(void);
337void acpi_thermal_cpufreq_exit(void); 337void acpi_thermal_cpufreq_exit(void);