aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 23:52:21 +0000
committerThomas Gleixner <tglx@linutronix.de>2011-02-25 20:24:22 +0100
commit8eb90c30e0e815a1308828352eabd03ca04229dd (patch)
treecc41c26975f8ab4e9f3ed734f1bdad9b3774685a /kernel
parent0c4602ff88d6d6ef0ee6d228ee9acaa6448ff6f5 (diff)
downloadkernel_samsung_smdk4412-8eb90c30e0e815a1308828352eabd03ca04229dd.zip
kernel_samsung_smdk4412-8eb90c30e0e815a1308828352eabd03ca04229dd.tar.gz
kernel_samsung_smdk4412-8eb90c30e0e815a1308828352eabd03ca04229dd.tar.bz2
sched: Switch wait_task_inactive to schedule_hrtimeout()
When we force thread hard and soft interrupts the startup of ksoftirqd would hang in kthread_bind() when wait_task_inactive() calls schedule_timeout_uninterruptible() because there is no softirq yet which will wake us up. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20110223234956.677109139@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 18d38e4..66ca5d9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2224,7 +2224,10 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
* yield - it could be a while.
*/
if (unlikely(on_rq)) {
- schedule_timeout_uninterruptible(1);
+ ktime_t to = ktime_set(0, NSEC_PER_SEC/HZ);
+
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_hrtimeout(&to, HRTIMER_MODE_REL);
continue;
}