1 files changed, 26 insertions, 64 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 81a173c0897d..660c8ae93471 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -90,6 +90,7 @@ struct sched_param {
 #include <linux/latencytop.h>
 #include <linux/cred.h>
 #include <linux/llist.h>
+#include <linux/uidgid.h>
 
 #include <asm/processor.h>
 
@@ -728,8 +729,7 @@ struct user_struct {
 
         /* Hash table maintenance information */
         struct hlist_node uidhash_node;
-        uid_t uid;
-        struct user_namespace *user_ns;
+        kuid_t uid;
 
 #ifdef CONFIG_PERF_EVENTS
         atomic_long_t locked_vm;
@@ -738,7 +738,7 @@ struct user_struct {
 
 extern int uids_sysfs_init(void);
 
-extern struct user_struct *find_user(uid_t);
+extern struct user_struct *find_user(kuid_t);
 
 extern struct user_struct root_user;
 #define INIT_USER (&root_user)
@@ -855,61 +855,14 @@ enum cpu_idle_type {
 #define SD_WAKE_AFFINE          0x0020  /* Wake task to waking CPU */
 #define SD_PREFER_LOCAL         0x0040  /* Prefer to keep tasks local to this domain */
 #define SD_SHARE_CPUPOWER       0x0080  /* Domain members share cpu power */
-#define SD_POWERSAVINGS_BALANCE 0x0100  /* Balance for power savings */
 #define SD_SHARE_PKG_RESOURCES  0x0200  /* Domain members share cpu pkg resources */
 #define SD_SERIALIZE            0x0400  /* Only a single load balancing instance */
 #define SD_ASYM_PACKING         0x0800  /* Place busy groups earlier in the domain */
 #define SD_PREFER_SIBLING       0x1000  /* Prefer to place tasks in a sibling domain */
 #define SD_OVERLAP              0x2000  /* sched_domains of this level overlap */
 
-enum powersavings_balance_level {
-        POWERSAVINGS_BALANCE_NONE = 0,  /* No power saving load balance */
-        POWERSAVINGS_BALANCE_BASIC,     /* Fill one thread/core/package
-                                         * first for long running threads
-                                         */
-        POWERSAVINGS_BALANCE_WAKEUP,    /* Also bias task wakeups to semi-idle
-                                         * cpu package for power savings
-                                         */
-        MAX_POWERSAVINGS_BALANCE_LEVELS
-};
-
-extern int sched_mc_power_savings, sched_smt_power_savings;
-
-static inline int sd_balance_for_mc_power(void)
-{
-        if (sched_smt_power_savings)
-                return SD_POWERSAVINGS_BALANCE;
-
-        if (!sched_mc_power_savings)
-                return SD_PREFER_SIBLING;
-
-        return 0;
-}
-
-static inline int sd_balance_for_package_power(void)
-{
-        if (sched_mc_power_savings | sched_smt_power_savings)
-                return SD_POWERSAVINGS_BALANCE;
-
-        return SD_PREFER_SIBLING;
-}
-
 extern int __weak arch_sd_sibiling_asym_packing(void);
 
-/*
- * Optimise SD flags for power savings:
- * SD_BALANCE_NEWIDLE helps aggressive task consolidation and power savings.
- * Keep default SD flags if sched_{smt,mc}_power_saving=0
- */
-
-static inline int sd_power_saving_flags(void)
-{
-        if (sched_mc_power_savings | sched_smt_power_savings)
-                return SD_BALANCE_NEWIDLE;
-
-        return 0;
-}
-
 struct sched_group_power {
         atomic_t ref;
         /*
@@ -1341,16 +1294,13 @@ struct task_struct {
                                  * execve */
         unsigned in_iowait:1;
 
+        /* task may not gain privileges */
+        unsigned no_new_privs:1;
 
         /* Revert to default priority/policy when forking */
         unsigned sched_reset_on_fork:1;
         unsigned sched_contributes_to_load:1;
 
-#ifdef CONFIG_GENERIC_HARDIRQS
-        /* IRQ handler threads */
-        unsigned irq_thread:1;
-#endif
-
         pid_t pid;
         pid_t tgid;
 
@@ -1358,10 +1308,9 @@ struct task_struct {
         /* Canary value for the -fstack-protector gcc feature */
         unsigned long stack_canary;
 #endif
-
-        /* 
+        /*
          * pointers to (original) parent process, youngest child, younger sibling,
-         * older sibling, respectively.  (p->father can be replaced with 
+         * older sibling, respectively.  (p->father can be replaced with
          * p->real_parent->pid)
          */
         struct task_struct __rcu *real_parent; /* real parent process */
@@ -1408,8 +1357,6 @@ struct task_struct {
                                          * credentials (COW) */
         const struct cred __rcu *cred;  /* effective (overridable) subjective task
                                          * credentials (COW) */
-        struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
-
         char comm[TASK_COMM_LEN]; /* executable name excluding path
                                      - access with [gs]et_task_comm (which lock
                                        it with task_lock())
@@ -1445,12 +1392,14 @@ struct task_struct {
         int (*notifier)(void *priv);
         void *notifier_data;
         sigset_t *notifier_mask;
+        struct hlist_head task_works;
+
         struct audit_context *audit_context;
 #ifdef CONFIG_AUDITSYSCALL
         uid_t loginuid;
         unsigned int sessionid;
 #endif
-        seccomp_t seccomp;
+        struct seccomp seccomp;
 
 /* Thread group tracking */
         u32 parent_exec_id;
@@ -1617,6 +1566,10 @@ struct task_struct {
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         atomic_t ptrace_bp_refcnt;
 #endif
+#ifdef CONFIG_UPROBES
+        struct uprobe_task *utask;
+        int uprobe_srcu_id;
+#endif
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -1905,12 +1858,22 @@ static inline void rcu_copy_process(struct task_struct *p)
         INIT_LIST_HEAD(&p->rcu_node_entry);
 }
 
+static inline void rcu_switch_from(struct task_struct *prev)
+{
+        if (prev->rcu_read_lock_nesting != 0)
+                rcu_preempt_note_context_switch();
+}
+
 #else
 
 static inline void rcu_copy_process(struct task_struct *p)
 {
 }
 
+static inline void rcu_switch_from(struct task_struct *prev)
+{
+}
+
 #endif
 
 #ifdef CONFIG_SMP
@@ -1950,7 +1913,7 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
  */
 extern unsigned long long notrace sched_clock(void);
 /*
- * See the comment in kernel/sched_clock.c
+ * See the comment in kernel/sched/clock.c
  */
 extern u64 cpu_clock(int cpu);
 extern u64 local_clock(void);
@@ -2177,14 +2140,13 @@ extern struct task_struct *find_task_by_pid_ns(pid_t nr,
 extern void __set_special_pids(struct pid *pid);
 
 /* per-UID process charging. */
-extern struct user_struct * alloc_uid(struct user_namespace *, uid_t);
+extern struct user_struct * alloc_uid(kuid_t);
 static inline struct user_struct *get_uid(struct user_struct *u)
 {
         atomic_inc(&u->__count);
         return u;
 }
 extern void free_uid(struct user_struct *);
-extern void release_uids(struct user_namespace *ns);
 
 #include <asm/current.h>