diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 13:15:11 +0100 |
| commit | af90aa3080dd6af491f0131165a58beedb9e6217 (patch) | |
| tree | d4a76180397fd7c2dd3c6ef6060bdc55be37cbe1 /drivers/cpufreq | |
| parent | 4fb23ca1a553ad49a02e0fffc0474f615a72660e (diff) | |
| parent | be3d845ee40c30b52b56a7fb44013674ccab03fd (diff) | |
| download | kernel_samsung_smdk4412-replicant-6.0-old.zip kernel_samsung_smdk4412-replicant-6.0-old.tar.gz kernel_samsung_smdk4412-replicant-6.0-old.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0replicant-6.0-alpha-0002replicant-6.0-old
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
usr/galaxys2_initramfs_files/init
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq_pegasusq.c | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 9d4b5dd..8112af3 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -17,17 +17,6 @@ config CPU_FREQ if CPU_FREQ -config HAS_BLUETOOTH_DEADLOCKS - bool "System has bluetooth deadlocks" - depends on BT_BCM4334 - default y - help - It seems that Android Lollipop introduced a bug which causes an - event listener to deadlock when A2DP is used and governor forces - only one core to stay awake. This hack prevents such situation by - always leaving at least two cores online. I wish we could get rid - of this at some point. - config CPU_FREQ_TABLE tristate diff --git a/drivers/cpufreq/cpufreq_pegasusq.c b/drivers/cpufreq/cpufreq_pegasusq.c index aa172a1..c44af54 100644 --- a/drivers/cpufreq/cpufreq_pegasusq.c +++ b/drivers/cpufreq/cpufreq_pegasusq.c @@ -155,11 +155,7 @@ static unsigned int get_nr_run_avg(void) #define MAX_HOTPLUG_RATE (40u) #define DEF_MAX_CPU_LOCK (0) -#ifdef CONFIG_HAS_BLUETOOTH_DEADLOCKS -#define DEF_MIN_CPU_LOCK (2) -#else #define DEF_MIN_CPU_LOCK (0) -#endif #define DEF_CPU_UP_FREQ (500000) #define DEF_CPU_DOWN_FREQ (200000) #define DEF_UP_NR_CPUS (1) |