From d3e8bac299b920bf8b72b3c4642876671fb9cf90 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Mon, 21 Jan 2013 20:48:17 +0100 Subject: [PATCH] --- yaml --- r: 348948 b: refs/heads/master c: 9067ac85d533651b98c2ff903182a20cbb361fcb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a009686e156f..330f7324b4a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9899d11f654474d2d54ea52ceaa2a1f4db3abd68 +refs/heads/master: 9067ac85d533651b98c2ff903182a20cbb361fcb diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 257002c13bb0..26058d0bebba 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -1523,7 +1523,8 @@ static void try_to_wake_up_local(struct task_struct *p) */ int wake_up_process(struct task_struct *p) { - return try_to_wake_up(p, TASK_ALL, 0); + WARN_ON(task_is_stopped_or_traced(p)); + return try_to_wake_up(p, TASK_NORMAL, 0); } EXPORT_SYMBOL(wake_up_process);