[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 <sm8326.kim@samsung.com>

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index de2b782fc9d4e4d2fe39c53827d64e71af6de53b..abb8e905fadef4b465f3116bf763ccae50bd47b7 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -41,7 +41,7 @@
 #include <linux/gpu_cooling.h>
 #include <linux/isp_cooling.h>
 #include <linux/slab.h>
-#include <soc/samsung/cpufreq.h>
+#include <soc/samsung/tmu.h>
 
 #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 31d6ec0a6be0c489ca6979fda617d2adb146358c..04bf8876af6fe191d51d12adecd0c0e1e1f2e28d 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -25,6 +25,8 @@
 #include <linux/cpu_cooling.h>
 #include <dt-bindings/thermal/thermal_exynos.h>
 
+#define NR_HOTPLUG_CPUS        4
+
 enum soc_type {
        SOC_ARCH_EXYNOS8890 = 1,
        SOC_ARCH_EXYNOS8895 = 2,