aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-29 15:04:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-29 15:04:07 +0200
commit2cc6ced132f472b2bdb619960a650b9a85cdd34f (patch)
tree171d6613cd7117dcd750efdd665ec2eab6e24a8e /include
parentMerge branch 'pm-assorted' (diff)
parentcpufreq: don't leave stale policy pointer in cdbs->cur_policy (diff)
downloadlinux-dev-2cc6ced132f472b2bdb619960a650b9a85cdd34f.tar.xz
linux-dev-2cc6ced132f472b2bdb619960a650b9a85cdd34f.zip
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: don't leave stale policy pointer in cdbs->cur_policy acpi-cpufreq: Add new sysfs attribute freqdomain_cpus cpufreq: make sure frequency transitions are serialized
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpufreq.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 3c7ee2f90370..4d7390bc1727 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -119,6 +119,7 @@ struct cpufreq_policy {
struct kobject kobj;
struct completion kobj_unregister;
+ bool transition_ongoing; /* Tracks transition status */
};
#define CPUFREQ_ADJUST (0)
@@ -438,4 +439,7 @@ void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,
void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy);
void cpufreq_frequency_table_put_attr(unsigned int cpu);
+
+ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf);
+
#endif /* _LINUX_CPUFREQ_H */