summaryrefslogtreecommitdiffstats
path: root/include/acpi/processor.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 15:52:35 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 15:52:35 +0200
commit4ffe18c2556f2848c4e57457915b08a63dc00fd5 (patch)
tree0e5045b2137095c9ad88cb7c5062e5801e377936 /include/acpi/processor.h
parentMerge branch 'device-properties' (diff)
parentcpufreq: speedstep-lib: Use monotonic clock (diff)
downloadlinux-4ffe18c2556f2848c4e57457915b08a63dc00fd5.tar.xz
linux-4ffe18c2556f2848c4e57457915b08a63dc00fd5.zip
Merge branch 'pm-cpufreq'
* pm-cpufreq: (53 commits) cpufreq: speedstep-lib: Use monotonic clock cpufreq: powernv: Increase the verbosity of OCC console messages cpufreq: sfi: use kmemdup rather than duplicating its implementation cpufreq: drop !cpufreq_driver check from cpufreq_parse_governor() cpufreq: rename cpufreq_real_policy as cpufreq_user_policy cpufreq: remove redundant 'policy' field from user_policy cpufreq: remove redundant 'governor' field from user_policy cpufreq: update user_policy.* on success cpufreq: use memcpy() to copy policy cpufreq: remove redundant CPUFREQ_INCOMPATIBLE notifier event cpufreq: mediatek: Add MT8173 cpufreq driver dt-bindings: mediatek: Add MT8173 CPU DVFS clock bindings intel_pstate: append more Oracle OEM table id to vendor bypass list intel_pstate: Add SKY-S support intel_pstate: Fix possible overflow complained by Coverity cpufreq: Correct a freq check in cpufreq_set_policy() cpufreq: Lock CPU online/offline in cpufreq_register_driver() cpufreq: Replace recover_policy with new_policy in cpufreq_online() cpufreq: Separate CPU device registration from CPU online cpufreq: powernv: Restore cpu frequency to policy->cur on unthrottling ...
Diffstat (limited to 'include/acpi/processor.h')
-rw-r--r--include/acpi/processor.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 2c4e7a9c1725..ff5f135f16b1 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -228,10 +228,7 @@ extern int acpi_processor_preregister_performance(struct
extern int acpi_processor_register_performance(struct acpi_processor_performance
*performance, unsigned int cpu);
-extern void acpi_processor_unregister_performance(struct
- acpi_processor_performance
- *performance,
- unsigned int cpu);
+extern void acpi_processor_unregister_performance(unsigned int cpu);
/* note: this locks both the calling module and the processor module
if a _PPC object exists, rmmod is disallowed then */