diff --git a/[refs] b/[refs] index 558221a36ac1..60c5b5cfdc50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f22ab814a24e654b1de24db0c5f8b57b5ab2026a +refs/heads/master: 364d3c13c17f45da6d638011078d4c4d3070d719 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 6aca4a16e377..79e749dbf81e 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -2054,9 +2054,6 @@ static inline int signal_pending_state(long state, struct task_struct *p) if (!signal_pending(p)) return 0; - if (state & (__TASK_STOPPED | __TASK_TRACED)) - return 0; - return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); }