Merge branch 'linus' into core/softlockup
This commit is contained in:
@@ -767,7 +767,6 @@ struct sched_domain {
|
||||
struct sched_domain *child; /* bottom domain must be null terminated */
|
||||
struct sched_group *groups; /* the balancing groups of the domain */
|
||||
cpumask_t span; /* span of all CPUs in this domain */
|
||||
int first_cpu; /* cache of the first cpu in this domain */
|
||||
unsigned long min_interval; /* Minimum balance interval ms */
|
||||
unsigned long max_interval; /* Maximum balance interval ms */
|
||||
unsigned int busy_factor; /* less balancing by factor if busy */
|
||||
@@ -1849,7 +1848,9 @@ extern void exit_thread(void);
|
||||
extern void exit_files(struct task_struct *);
|
||||
extern void __cleanup_signal(struct signal_struct *);
|
||||
extern void __cleanup_sighand(struct sighand_struct *);
|
||||
|
||||
extern void exit_itimers(struct signal_struct *);
|
||||
extern void flush_itimer_signals(void);
|
||||
|
||||
extern NORET_TYPE void do_group_exit(int);
|
||||
|
||||
@@ -2026,6 +2027,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));
|
||||
|
Reference in New Issue
Block a user