Merge branch 'next' into for-linus

Prepare first round of input updates for 4.3 merge window.

1 files changed, 2 insertions, 11 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 696d22312b31..e8493fee8160 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -25,13 +25,6 @@
 extern struct files_struct init_files;
 extern struct fs_struct init_fs;
 
-#ifdef CONFIG_CGROUPS
-#define INIT_GROUP_RWSEM(sig)                                           \
-        .group_rwsem = __RWSEM_INITIALIZER(sig.group_rwsem),
-#else
-#define INIT_GROUP_RWSEM(sig)
-#endif
-
 #ifdef CONFIG_CPUSETS
 #define INIT_CPUSET_SEQ(tsk)                                                    \
         .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq),
@@ -50,13 +43,11 @@ extern struct fs_struct init_fs;
         .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
         .rlim           = INIT_RLIMITS,                                 \
         .cputimer       = {                                             \
-                .cputime = INIT_CPUTIME,                                \
-                .running = 0,                                           \
-                .lock = __RAW_SPIN_LOCK_UNLOCKED(sig.cputimer.lock),    \
+                .cputime_atomic = INIT_CPUTIME_ATOMIC,                  \
+                .running        = 0,                                    \
         },                                                              \
         .cred_guard_mutex =                                             \
                  __MUTEX_INITIALIZER(sig.cred_guard_mutex),             \
-        INIT_GROUP_RWSEM(sig)                                           \
 }
 
 extern struct nsproxy init_nsproxy;