aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/cpufreq.h19
1 files changed, 16 insertions, 3 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 0899e2cdcdd1..cb9b2ec8849c 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -32,7 +32,15 @@
32 * CPUFREQ NOTIFIER INTERFACE * 32 * CPUFREQ NOTIFIER INTERFACE *
33 *********************************************************************/ 33 *********************************************************************/
34 34
35#ifdef CONFIG_CPU_FREQ
35int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list); 36int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
37#else
38static inline int cpufreq_register_notifier(struct notifier_block *nb,
39 unsigned int list)
40{
41 return 0;
42}
43#endif
36int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list); 44int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
37 45
38#define CPUFREQ_TRANSITION_NOTIFIER (0) 46#define CPUFREQ_TRANSITION_NOTIFIER (0)
@@ -261,17 +269,22 @@ int cpufreq_set_policy(struct cpufreq_policy *policy);
261int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu); 269int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
262int cpufreq_update_policy(unsigned int cpu); 270int cpufreq_update_policy(unsigned int cpu);
263 271
264/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
265unsigned int cpufreq_get(unsigned int cpu);
266 272
267/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */ 273/*
274 * query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it
275 */
268#ifdef CONFIG_CPU_FREQ 276#ifdef CONFIG_CPU_FREQ
269unsigned int cpufreq_quick_get(unsigned int cpu); 277unsigned int cpufreq_quick_get(unsigned int cpu);
278unsigned int cpufreq_get(unsigned int cpu);
270#else 279#else
271static inline unsigned int cpufreq_quick_get(unsigned int cpu) 280static inline unsigned int cpufreq_quick_get(unsigned int cpu)
272{ 281{
273 return 0; 282 return 0;
274} 283}
284static inline unsigned int cpufreq_get(unsigned int cpu)
285{
286 return 0;
287}
275#endif 288#endif
276 289
277 290