Merge branches 'release' and 'menlo' into release

[sfrench/cifs-2.6.git] / include / acpi / processor.h

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 0787635a11aa52ba473c162aa77ec36329d937d9..0c75a0b9c565f3e82d0125734d92a36710b79f97 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -34,6 +34,7 @@
 
 #define ACPI_CSTATE_SYSTEMIO   (0)
 #define ACPI_CSTATE_FFH                (1)
+#define ACPI_CSTATE_HALT       (2)
 
 /* Power Management */
 
@@ -64,7 +65,7 @@ struct acpi_processor_cx {
        u8 valid;
        u8 type;
        u32 address;
-       u8 space_id;
+       u8 entry_method;
        u8 index;
        u32 latency;
        u32 latency_ticks;
@@ -182,7 +183,7 @@ struct acpi_processor_throttling {
 /* Limit Interface */
 
 struct acpi_processor_lx {
-       int px;                 /* performace state */
+       int px;                 /* performance state */
        int tx;                 /* throttle level */
 };