Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348948
b: refs/heads/master
c: 9067ac8
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Jan 22, 2013
1 parent 496dbb9 commit d3e8bac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9899d11f654474d2d54ea52ceaa2a1f4db3abd68
refs/heads/master: 9067ac85d533651b98c2ff903182a20cbb361fcb
3 changes: 2 additions & 1 deletion trunk/kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d3e8bac

Please sign in to comment.