mirror/android_kernel_fxtec_sm6115
3
0
Fork 0
mirror of https://github.com/LineageOS/android_kernel_fxtec_sm6115.git synced 2026-08-19 04:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

timer: Do not require CPUSETS to be enabled for migration

Browse Source 
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>
This commit is contained in:
Olav Haugan
2016-07-03 15:02:08 -07:00
committed by Satya Durga Srinivasu Prabhala
parent 7368bc9d17
commit ec86ffd80c
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/time/hrtimer.c
View File

@ -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)
{

2
kernel/time/timer.c
View File

@ -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 */