From: Mark Brown <broonie@linaro.org>
Date: Wed, 23 Apr 2014 22:55:23 +0000 (+0100)
Subject: Merge branch 'v3.10/topic/cpufreq' of git://git.linaro.org/kernel/linux-linaro-stable... 
X-Git-Tag: firefly_0821_release~3680^2~139^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=08a92bdc033b579656887b1621511bcefa38dfab;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v3.10/topic/cpufreq' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk
---

08a92bdc033b579656887b1621511bcefa38dfab
diff --cc drivers/cpufreq/cpufreq.c
index 66f6cf5064ec,d444bfe83f13..ce94c323fa13
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -46,8 -48,15 +48,16 @@@ static DEFINE_PER_CPU(struct cpufreq_po
  static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);
  #endif
  static DEFINE_RWLOCK(cpufreq_driver_lock);
 +static DEFINE_MUTEX(cpufreq_governor_lock);
  
+ /* Flag to suspend/resume CPUFreq governors */
+ static bool cpufreq_suspended;
+ 
+ static inline bool has_target(void)
+ {
+ 	return cpufreq_driver->target;
+ }
+ 
  /*
   * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure
   * all cpufreq/hotplug/workqueue/etc related lock issues.