diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-10 20:46:03 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-10 20:46:03 +0100 |
| commit | a5acbfbd70bc6a0cd4c8ca8f4f5e52ac3ee7dca4 (patch) | |
| tree | 5e4560aaaaf2dec73a25bf448e0dd73ded4f9117 /include | |
| parent | edd4a893e097d744e8069acf585f8b02dbbc9134 (diff) | |
| parent | adaf9fcd136970e480d7ca834c0cf25ce922ea74 (diff) | |
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 5 | ||||
| -rw-r--r-- | include/linux/sched.h | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4064cfcfbffd..718e8725de8a 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -80,7 +80,6 @@ struct cpufreq_policy { unsigned int last_policy; /* policy before unplug */ struct cpufreq_governor *governor; /* see below */ void *governor_data; - bool governor_enabled; /* governor start/stop flag */ char last_governor[CPUFREQ_NAME_LEN]; /* last governor used */ struct work_struct update; /* if update_policy() needs to be @@ -100,10 +99,6 @@ struct cpufreq_policy { * - Any routine that will write to the policy structure and/or may take away * the policy altogether (eg. CPU hotplug), will hold this lock in write * mode before doing so. - * - * Additional rules: - * - Lock should not be held across - * __cpufreq_governor(data, CPUFREQ_GOV_POLICY_EXIT); */ struct rw_semaphore rwsem; diff --git a/include/linux/sched.h b/include/linux/sched.h index a10494a94cc3..913e755ef7b8 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -3207,4 +3207,13 @@ static inline unsigned long rlimit_max(unsigned int limit) return task_rlimit_max(current, limit); } +#ifdef CONFIG_CPU_FREQ +struct update_util_data { + void (*func)(struct update_util_data *data, + u64 time, unsigned long util, unsigned long max); +}; + +void cpufreq_set_update_util_data(int cpu, struct update_util_data *data); +#endif /* CONFIG_CPU_FREQ */ + #endif |