diff options
| author | Len Brown <len.brown@intel.com> | 2004-12-01 08:28:14 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-12-01 08:28:14 -0500 |
| commit | 49f6e706ff7c2bc848313929401a6ccfedda3b09 (patch) | |
| tree | b5b1314ea866fdd4bea5d53d20b0530ecf3e103e /include | |
| parent | 591e47a6006887b957d852889f9d4332f98e4335 (diff) | |
| parent | 211001b963eba0d1e79826b00fc51316220653e6 (diff) | |
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/processor.h | 6 | ||||
| -rw-r--r-- | include/linux/acpi.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 055e97ca13e9..3982834e96ad 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -17,7 +17,7 @@ struct acpi_processor_cx_policy { u32 count; - int state; + u32 state; struct { u32 time; u32 ticks; @@ -38,8 +38,8 @@ struct acpi_processor_cx { }; struct acpi_processor_power { - int state; - int default_state; + u32 state; + u32 default_state; u32 bm_activity; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; }; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5960e3c49fe7..9cd73a47fc18 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -483,15 +483,15 @@ static inline int acpi_blacklisted(void) * 2: C2 okay, but not C3 etc. */ -extern unsigned int acpi_cstate_limit; +extern unsigned int max_cstate; static inline unsigned int acpi_get_cstate_limit(void) { - return acpi_cstate_limit; + return max_cstate; } static inline void acpi_set_cstate_limit(unsigned int new_limit) { - acpi_cstate_limit = new_limit; + max_cstate = new_limit; return; } #else |