diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-29 15:04:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-29 15:04:07 +0200 |
| commit | 2cc6ced132f472b2bdb619960a650b9a85cdd34f (patch) | |
| tree | 171d6613cd7117dcd750efdd665ec2eab6e24a8e /include/linux | |
| parent | 867a420b222b25e9608f4430bea3af50835b56b5 (diff) | |
| parent | 419e172145cf6c51d436a8bf4afcd17511f0ff79 (diff) | |
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/linux')
| -rw-r--r-- | include/linux/cpufreq.h | 4 |
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 */ |