diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:30:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:30:48 -0500 |
| commit | 8976b6fd7a0060f72e20d5cec833c03d50874cd1 (patch) | |
| tree | d5c98a6fc41e19b5a85e9181072d74452b2dc2ab /include/acpi | |
| parent | 52b097fff89b14c0b8b7a7deef1d274889b1886d (diff) | |
| parent | 3391a76f2bbb74e42b9ba44c05a7366ffd388753 (diff) | |
Merge branches 'release' and 'throttling-domains' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/processor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0c75a0b9c565..cdc8004cfd12 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -177,6 +177,8 @@ struct acpi_processor_throttling { | |||
| 177 | u32 address; | 177 | u32 address; |
| 178 | u8 duty_offset; | 178 | u8 duty_offset; |
| 179 | u8 duty_width; | 179 | u8 duty_width; |
| 180 | u8 tsd_valid_flag; | ||
| 181 | unsigned int shared_type; | ||
| 180 | struct acpi_processor_tx states[ACPI_PROCESSOR_MAX_THROTTLING]; | 182 | struct acpi_processor_tx states[ACPI_PROCESSOR_MAX_THROTTLING]; |
| 181 | }; | 183 | }; |
| 182 | 184 | ||
| @@ -317,7 +319,7 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) | |||
| 317 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); | 319 | int acpi_processor_get_throttling_info(struct acpi_processor *pr); |
| 318 | 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); |
| 319 | extern struct file_operations acpi_processor_throttling_fops; | 321 | extern struct file_operations acpi_processor_throttling_fops; |
| 320 | 322 | extern void acpi_processor_throttling_init(void); | |
| 321 | /* in processor_idle.c */ | 323 | /* in processor_idle.c */ |
| 322 | int acpi_processor_power_init(struct acpi_processor *pr, | 324 | int acpi_processor_power_init(struct acpi_processor *pr, |
| 323 | struct acpi_device *device); | 325 | struct acpi_device *device); |