From ec86ffd80c8fbcc22adff9bdb7f4e1aae0cb73fb Mon Sep 17 00:00:00 2001
From: Olav Haugan <ohaugan@codeaurora.org>
Date: Sun, 3 Jul 2016 15:02:08 -0700
Subject: [PATCH] timer: Do not require CPUSETS to be enabled for migration

Do not require CPUSETS to be enabled to allow migration of timers and
hrtimers.

Change-Id: I898bde98cdc205f865226811efd8d45a406f2547
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
[rameezmustafa@codeaurora.org: Port to msm-4.9]
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
---
 kernel/time/hrtimer.c | 9 +++------
 kernel/time/timer.c   | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 46a6f6c720cd..142bb6e1b52b 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1831,7 +1831,7 @@ int hrtimers_prepare_cpu(unsigned int cpu)
 	return 0;
 }
 
-#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_CPUSETS)
+#ifdef CONFIG_HOTPLUG_CPU
 static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
 				 struct hrtimer_clock_base *new_base,
 				 bool remove_pinned)
@@ -1923,9 +1923,7 @@ static void __migrate_hrtimers(unsigned int scpu, bool remove_pinned)
 	local_irq_restore(flags);
 	local_bh_enable();
 }
-#endif /* CONFIG_HOTPLUG_CPU || CONFIG_CPUSETS */
 
-#ifdef CONFIG_HOTPLUG_CPU
 int hrtimers_dead_cpu(unsigned int scpu)
 {
 	BUG_ON(cpu_online(scpu));
@@ -1934,14 +1932,13 @@ int hrtimers_dead_cpu(unsigned int scpu)
 	__migrate_hrtimers(scpu, true);
 	return 0;
 }
-#endif /* CONFIG_HOTPLUG_CPU */
 
-#ifdef CONFIG_CPUSETS
 void hrtimer_quiesce_cpu(void *cpup)
 {
 	__migrate_hrtimers(*(int *)cpup, false);
 }
-#endif /* CONFIG_CPUSETS */
+
+#endif /* CONFIG_HOTPLUG_CPU */
 
 void __init hrtimers_init(void)
 {
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index ea2015946127..cfb478478a0b 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1945,12 +1945,10 @@ int timers_dead_cpu(unsigned int cpu)
 	return 0;
 }
 
-#ifdef CONFIG_CPUSETS
 void timer_quiesce_cpu(void *cpup)
 {
 	__migrate_timers(*(unsigned int *)cpup, false);
 }
-#endif /* CONFIG_CPUSETS */
 
 #endif /* CONFIG_HOTPLUG_CPU */