From acd58d55ebfb7d5eec7b13805f4c7226ab9fe1ed Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 26 Oct 2009 16:49:29 -0700 Subject: [PATCH] --- yaml --- r: 167720 b: refs/heads/master c: 2eca40a8ccd4160dbfaa5cbd61038d921d0e5f13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/cpufreq.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c3be15afcd52..536490daa952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 964fe080d94db82a3268443e9b9ece4c60246414 +refs/heads/master: 2eca40a8ccd4160dbfaa5cbd61038d921d0e5f13 diff --git a/trunk/include/linux/cpufreq.h b/trunk/include/linux/cpufreq.h index 44717eb47639..79a2340d83cd 100644 --- a/trunk/include/linux/cpufreq.h +++ b/trunk/include/linux/cpufreq.h @@ -291,8 +291,15 @@ struct global_attr { int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu); int cpufreq_update_policy(unsigned int cpu); +#ifdef CONFIG_CPU_FREQ /* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */ unsigned int cpufreq_get(unsigned int cpu); +#else +static inline unsigned int cpufreq_get(unsigned int cpu) +{ + return 0; +} +#endif /* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */ #ifdef CONFIG_CPU_FREQ