From a9e87164b8984f4a22dfc9a2fb45eb23d14052d5 Mon Sep 17 00:00:00 2001 From: Syed Rameez Mustafa Date: Thu, 12 Jan 2017 21:31:07 -0800 Subject: [PATCH] sched: reduce sleep duration in wait_task_inactive() Sleeping for a second adds unnecessary latency to hotplugging a cpu (cpu_up). Reduce the wait time down to 1 ms which is in line with earlier kernel versions. The 1 second value was caused due to an incorrect merge conflict resolution during kernel upgrade. Change-Id: Ice58147fff4d9b997def823436510ce23b02eb8e Signed-off-by: Syed Rameez Mustafa [satyap@codeaurora.org: trivial merge conflict resolution] Signed-off-by: Satya Durga Srinivasu Prabhala --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 74fd1edad65e..f21f9261ba39 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1962,7 +1962,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) * yield - it could be a while. */ if (unlikely(queued)) { - ktime_t to = NSEC_PER_SEC / HZ; + ktime_t to = NSEC_PER_MSEC; set_current_state(TASK_UNINTERRUPTIBLE); schedule_hrtimeout(&to, HRTIMER_MODE_REL);