1 files changed, 21 insertions, 13 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4ac7d51ad0e1..c204ab0d4df1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -74,6 +74,7 @@ struct sched_param {
 #include <linux/pid.h>
 #include <linux/percpu.h>
 #include <linux/topology.h>
+#include <linux/proportions.h>
 #include <linux/seccomp.h>
 #include <linux/rcupdate.h>
 #include <linux/futex.h>
@@ -260,6 +261,7 @@ extern void softlockup_tick(void);
 extern void spawn_softlockup_task(void);
 extern void touch_softlockup_watchdog(void);
 extern void touch_all_softlockup_watchdogs(void);
+extern int softlockup_thresh;
 #else
 static inline void softlockup_tick(void)
 {
@@ -357,8 +359,9 @@ extern int get_dumpable(struct mm_struct *mm);
 #define MMF_DUMP_ANON_SHARED    3
 #define MMF_DUMP_MAPPED_PRIVATE 4
 #define MMF_DUMP_MAPPED_SHARED  5
+#define MMF_DUMP_ELF_HEADERS    6
 #define MMF_DUMP_FILTER_SHIFT   MMF_DUMPABLE_BITS
-#define MMF_DUMP_FILTER_BITS    4
+#define MMF_DUMP_FILTER_BITS    5
 #define MMF_DUMP_FILTER_MASK \
         (((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT)
 #define MMF_DUMP_FILTER_DEFAULT \
@@ -515,8 +518,10 @@ struct user_struct {
         atomic_t inotify_watches; /* How many inotify watches does this user have? */
         atomic_t inotify_devs;  /* How many inotify devs does this user have opened? */
 #endif
+#ifdef CONFIG_POSIX_MQUEUE
         /* protected by mq_lock */
         unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */
+#endif
         unsigned long locked_shm; /* How many pages of mlocked shm ? */
 
 #ifdef CONFIG_KEYS
@@ -915,6 +920,16 @@ struct task_struct {
 #endif
 
         unsigned short ioprio;
+        /*
+         * fpu_counter contains the number of consecutive context switches
+         * that the FPU is used. If this is over a threshold, the lazy fpu
+         * saving becomes unlazy to save the trap. This is an unsigned char
+         * so that after 256 times the counter wraps and the behavior turns
+         * lazy again; this to deal with bursty apps that only use FPU for
+         * a short time
+         */
+        unsigned char fpu_counter;
+        s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
 #ifdef CONFIG_BLK_DEV_IO_TRACE
         unsigned int btrace_seq;
 #endif
@@ -1000,16 +1015,6 @@ struct task_struct {
         struct key *thread_keyring;     /* keyring private to this thread */
         unsigned char jit_keyring;      /* default keyring to attach requested keys to */
 #endif
-        /*
-         * fpu_counter contains the number of consecutive context switches
-         * that the FPU is used. If this is over a threshold, the lazy fpu
-         * saving becomes unlazy to save the trap. This is an unsigned char
-         * so that after 256 times the counter wraps and the behavior turns
-         * lazy again; this to deal with bursty apps that only use FPU for
-         * a short time
-         */
-        unsigned char fpu_counter;
-        int oomkilladj; /* OOM kill score adjustment (bit shift). */
         char comm[TASK_COMM_LEN]; /* executable name excluding path
                                      - access with [gs]et_task_comm (which lock
                                        it with task_lock())
@@ -1041,8 +1046,9 @@ struct task_struct {
         int (*notifier)(void *priv);
         void *notifier_data;
         sigset_t *notifier_mask;
-        
+#ifdef CONFIG_SECURITY
         void *security;
+#endif
         struct audit_context *audit_context;
         seccomp_t seccomp;
 
@@ -1131,13 +1137,14 @@ struct task_struct {
         int cpuset_mems_generation;
         int cpuset_mem_spread_rotor;
 #endif
+#ifdef CONFIG_FUTEX
         struct robust_list_head __user *robust_list;
 #ifdef CONFIG_COMPAT
         struct compat_robust_list_head __user *compat_robust_list;
 #endif
         struct list_head pi_state_list;
         struct futex_pi_state *pi_state_cache;
-
+#endif
         atomic_t fs_excl;       /* holding fs exclusive resources */
         struct rcu_head rcu;
 
@@ -1151,6 +1158,7 @@ struct task_struct {
 #ifdef CONFIG_FAULT_INJECTION
         int make_it_fail;
 #endif
+        struct prop_local_single dirties;
 };
 
 /*