summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-10-10 00:32:13 -0400
committerLen Brown <len.brown@intel.com>2007-10-10 00:32:13 -0400
commitde85871a9a53c00cae4c3a70849b5eaad0eb38b2 (patch)
treee1f5ea71da333598db35a63a2c6faa1343037412 /include/acpi
parent731aa5fd9971a5163845fbe55de63d686a11da0a (diff)
parente196441bdf2dbf0526b28a6829c39557c236d611 (diff)
downloadlinux-stable-de85871a9a53c00cae4c3a70849b5eaad0eb38b2.tar.gz
linux-stable-de85871a9a53c00cae4c3a70849b5eaad0eb38b2.tar.bz2
linux-stable-de85871a9a53c00cae4c3a70849b5eaad0eb38b2.zip
Pull cpuidle into test branch
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/processor.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 99934a999e66..26d79f6db8a0 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -3,6 +3,7 @@
#include <linux/kernel.h>
#include <linux/cpu.h>
+#include <linux/cpuidle.h>
#include <asm/acpi.h>
@@ -75,7 +76,9 @@ struct acpi_processor_cx {
};
struct acpi_processor_power {
+ struct cpuidle_device dev;
struct acpi_processor_cx *state;
+ struct acpi_processor_cx *bm_state;
unsigned long bm_check_timestamp;
u32 default_state;
u32 bm_activity;
@@ -199,6 +202,7 @@ struct acpi_processor_flags {
u8 bm_check:1;
u8 has_cst:1;
u8 power_setup_done:1;
+ u8 bm_rld_set:1;
};
struct acpi_processor {
@@ -322,6 +326,7 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
struct acpi_device *device);
int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);
int acpi_processor_resume(struct acpi_device * device);
+extern struct cpuidle_driver acpi_idle_driver;
/* in processor_thermal.c */
int acpi_processor_get_limit_info(struct acpi_processor *pr);