1 files changed, 38 insertions, 20 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2b094bdaafa..096834c7c63 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1298,7 +1298,7 @@ struct task_struct {
         int exit_state;
         int exit_code, exit_signal;
         int pdeath_signal;  /*  The signal sent when the parent dies  */
-        unsigned int group_stop;        /* GROUP_STOP_*, siglock protected */
+        unsigned int jobctl;    /* JOBCTL_*, siglock protected */
         /* ??? */
         unsigned int personality;
         unsigned did_exec:1;
@@ -1518,7 +1518,6 @@ struct task_struct {
         short il_next;
         short pref_node_fork;
 #endif
-        atomic_t fs_excl;       /* holding fs exclusive resources */
         struct rcu_head rcu;
 
         /*
@@ -1769,6 +1768,9 @@ static inline void put_task_struct(struct task_struct *t)
 extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
 extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
 
+extern int task_free_register(struct notifier_block *n);
+extern int task_free_unregister(struct notifier_block *n);
+
 /*
  * Per process flags
  */
@@ -1783,6 +1785,7 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *
 #define PF_DUMPCORE     0x00000200      /* dumped core */
 #define PF_SIGNALED     0x00000400      /* killed by a signal */
 #define PF_MEMALLOC     0x00000800      /* Allocating memory */
+#define PF_NPROC_EXCEEDED 0x00001000    /* set_user noticed that RLIMIT_NPROC was exceeded */
 #define PF_USED_MATH    0x00002000      /* if unset the fpu must be initialized before use */
 #define PF_FREEZING     0x00004000      /* freeze in progress. do not account to load */
 #define PF_NOFREEZE     0x00008000      /* this thread should not be frozen */
@@ -1828,15 +1831,34 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *
 #define used_math() tsk_used_math(current)
 
 /*
- * task->group_stop flags
+ * task->jobctl flags
  */
-#define GROUP_STOP_SIGMASK      0xffff    /* signr of the last group stop */
-#define GROUP_STOP_PENDING      (1 << 16) /* task should stop for group stop */
-#define GROUP_STOP_CONSUME      (1 << 17) /* consume group stop count */
-#define GROUP_STOP_TRAPPING     (1 << 18) /* switching from STOPPED to TRACED */
-#define GROUP_STOP_DEQUEUED     (1 << 19) /* stop signal dequeued */
-
-extern void task_clear_group_stop_pending(struct task_struct *task);
+#define JOBCTL_STOP_SIGMASK     0xffff  /* signr of the last group stop */
+
+#define JOBCTL_STOP_DEQUEUED_BIT 16     /* stop signal dequeued */
+#define JOBCTL_STOP_PENDING_BIT 17      /* task should stop for group stop */
+#define JOBCTL_STOP_CONSUME_BIT 18      /* consume group stop count */
+#define JOBCTL_TRAP_STOP_BIT    19      /* trap for STOP */
+#define JOBCTL_TRAP_NOTIFY_BIT  20      /* trap for NOTIFY */
+#define JOBCTL_TRAPPING_BIT     21      /* switching to TRACED */
+#define JOBCTL_LISTENING_BIT    22      /* ptracer is listening for events */
+
+#define JOBCTL_STOP_DEQUEUED    (1 << JOBCTL_STOP_DEQUEUED_BIT)
+#define JOBCTL_STOP_PENDING     (1 << JOBCTL_STOP_PENDING_BIT)
+#define JOBCTL_STOP_CONSUME     (1 << JOBCTL_STOP_CONSUME_BIT)
+#define JOBCTL_TRAP_STOP        (1 << JOBCTL_TRAP_STOP_BIT)
+#define JOBCTL_TRAP_NOTIFY      (1 << JOBCTL_TRAP_NOTIFY_BIT)
+#define JOBCTL_TRAPPING         (1 << JOBCTL_TRAPPING_BIT)
+#define JOBCTL_LISTENING        (1 << JOBCTL_LISTENING_BIT)
+
+#define JOBCTL_TRAP_MASK        (JOBCTL_TRAP_STOP | JOBCTL_TRAP_NOTIFY)
+#define JOBCTL_PENDING_MASK     (JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK)
+
+extern bool task_set_jobctl_pending(struct task_struct *task,
+                                    unsigned int mask);
+extern void task_clear_jobctl_trapping(struct task_struct *task);
+extern void task_clear_jobctl_pending(struct task_struct *task,
+                                      unsigned int mask);
 
 #ifdef CONFIG_PREEMPT_RCU
 
@@ -1952,7 +1974,6 @@ static inline void disable_sched_clock_irqtime(void) {}
 
 extern unsigned long long
 task_sched_runtime(struct task_struct *task);
-extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
 
 /* sched_exec is called by processes performing an exec */
 #ifdef CONFIG_SMP
@@ -2166,7 +2187,7 @@ extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_
 extern int kill_pgrp(struct pid *pid, int sig, int priv);
 extern int kill_pid(struct pid *pid, int sig, int priv);
 extern int kill_proc_info(int, struct siginfo *, pid_t);
-extern int do_notify_parent(struct task_struct *, int);
+extern __must_check bool do_notify_parent(struct task_struct *, int);
 extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
 extern void force_sig(int, struct task_struct *);
 extern int send_sig(int, struct task_struct *, int);
@@ -2290,8 +2311,10 @@ static inline int get_nr_threads(struct task_struct *tsk)
         return tsk->signal->nr_threads;
 }
 
-/* de_thread depends on thread_group_leader not being a pid based check */
-#define thread_group_leader(p)  (p == p->group_leader)
+static inline bool thread_group_leader(struct task_struct *p)
+{
+        return p->exit_signal >= 0;
+}
 
 /* Do to the insanities of de_thread it is possible for a process
  * to have the pid of the thread group leader without actually being
@@ -2324,11 +2347,6 @@ static inline int thread_group_empty(struct task_struct *p)
 #define delay_group_leader(p) \
                 (thread_group_leader(p) && !thread_group_empty(p))
 
-static inline int task_detached(struct task_struct *p)
-{
-        return p->exit_signal == -1;
-}
-
 /*
  * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring
  * subscriptions and synchronises with wait4().  Also used in procfs.  Also
@@ -2526,7 +2544,7 @@ extern int _cond_resched(void);
 
 extern int __cond_resched_lock(spinlock_t *lock);
 
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPT_COUNT
 #define PREEMPT_LOCK_OFFSET     PREEMPT_OFFSET
 #else
 #define PREEMPT_LOCK_OFFSET     0