From 882bca61bc24b962b9300ffd08325f25287a7a23 Mon Sep 17 00:00:00 2001 From: Soomin Kim Date: Mon, 11 Jul 2016 15:08:26 +0900 Subject: [PATCH] [COMMON] thermal: samsung: Define NR_HOTPLUG_CPUS NR_CLUST1_CPUS defined in include/soc/samsung/cpufreq.h isn't available because above file is deleted. Resolved migration conflicts from kernel 4.9 to 4.14. Change-Id: I79d9e5c318586fb7c9d43f26fd93b1bcbcda6a65 Signed-off-by: Soomin Kim --- drivers/thermal/samsung/exynos_tmu.c | 4 ++-- drivers/thermal/samsung/exynos_tmu.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index de2b782fc9d4..abb8e905fade 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include "exynos_tmu.h" #include "../thermal_core.h" @@ -979,7 +979,7 @@ static int exynos_throttle_cpu_hotplug(void *p, int temp) is_cpu_hotplugged_out = true; pm_qos_update_request(&thermal_cpu_hotplug_request, - NR_CLUST1_CPUS); + NR_HOTPLUG_CPUS); } } diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index 31d6ec0a6be0..04bf8876af6f 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h @@ -25,6 +25,8 @@ #include #include +#define NR_HOTPLUG_CPUS 4 + enum soc_type { SOC_ARCH_EXYNOS8890 = 1, SOC_ARCH_EXYNOS8895 = 2, -- 2.20.1