diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-09-07 12:27:20 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 12:27:20 +0200 |
| commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
| tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /include/acpi/processor.h | |
| parent | drm/kms: remove old std mode fallback code. (diff) | |
| parent | drm/i915: Put the idle reclocking work on our private workqueue as well. (diff) | |
| download | linux-11670d3c93210793562748d83502ecbef4034765.tar.xz linux-11670d3c93210793562748d83502ecbef4034765.zip | |
Merge intel drm-intel-next branch
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index baf1e0a9a7ee..740ac3ad8fd0 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -174,7 +174,7 @@ struct acpi_processor_throttling { cpumask_var_t shared_cpu_map; int (*acpi_processor_get_throttling) (struct acpi_processor * pr); int (*acpi_processor_set_throttling) (struct acpi_processor * pr, - int state); + int state, bool force); u32 address; u8 duty_offset; @@ -321,7 +321,8 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr) /* in processor_throttling.c */ int acpi_processor_tstate_has_changed(struct acpi_processor *pr); int acpi_processor_get_throttling_info(struct acpi_processor *pr); -extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); +extern int acpi_processor_set_throttling(struct acpi_processor *pr, + int state, bool force); extern const struct file_operations acpi_processor_throttling_fops; extern void acpi_processor_throttling_init(void); /* in processor_idle.c */ |