From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Mar 2015 12:27:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~19^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c810fcb930d9c705774427bb6eb551b2e1108adb;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
---

c810fcb930d9c705774427bb6eb551b2e1108adb
diff --cc drivers/cpufreq/cpufreq.c
index df9a2427c233,2d53f47d1747..66f6cf5064ec
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -48,16 -46,7 +46,8 @@@ 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.