Merge branch 'linus' into sched-devel

This commit is contained in:
Ingo Molnar
2008-06-16 11:15:21 +02:00
393 changed files with 3939 additions and 2471 deletions

View File

@@ -2009,6 +2009,19 @@ static inline int fatal_signal_pending(struct task_struct *p)
return signal_pending(p) && __fatal_signal_pending(p);
}
static inline int signal_pending_state(long state, struct task_struct *p)
{
if (!(state & (TASK_INTERRUPTIBLE | TASK_WAKEKILL)))
return 0;
if (!signal_pending(p))
return 0;
if (state & (__TASK_STOPPED | __TASK_TRACED))
return 0;
return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
}
static inline int need_resched(void)
{
return unlikely(test_thread_flag(TIF_NEED_RESCHED));