Merge tag 'v3.6-rc2' into drm-intel-next

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
  (since all their users have been extracted in another fucntion),
  -fixes added another user for a hw workaroudn.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 13 insertions, 3 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 9e65eff6af3b..89f1cb1056f0 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -123,8 +123,17 @@ extern struct group_info init_groups;
 
 extern struct cred init_cred;
 
+extern struct task_group root_task_group;
+
+#ifdef CONFIG_CGROUP_SCHED
+# define INIT_CGROUP_SCHED(tsk)                                         \
+        .sched_task_group = &root_task_group,
+#else
+# define INIT_CGROUP_SCHED(tsk)
+#endif
+
 #ifdef CONFIG_PERF_EVENTS
-# define INIT_PERF_EVENTS(tsk)                                  \
+# define INIT_PERF_EVENTS(tsk)                                          \
         .perf_event_mutex =                                             \
                  __MUTEX_INITIALIZER(tsk.perf_event_mutex),             \
         .perf_event_list = LIST_HEAD_INIT(tsk.perf_event_list),
@@ -161,6 +170,7 @@ extern struct cred init_cred;
         },                                                              \
         .tasks          = LIST_HEAD_INIT(tsk.tasks),                    \
         INIT_PUSHABLE_TASKS(tsk)                                        \
+        INIT_CGROUP_SCHED(tsk)                                          \
         .ptraced        = LIST_HEAD_INIT(tsk.ptraced),                  \
         .ptrace_entry   = LIST_HEAD_INIT(tsk.ptrace_entry),             \
         .real_parent    = &tsk,                                         \
@@ -168,8 +178,8 @@ extern struct cred init_cred;
         .children       = LIST_HEAD_INIT(tsk.children),                 \
         .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
         .group_leader   = &tsk,                                         \
-        RCU_INIT_POINTER(.real_cred, &init_cred),                       \
-        RCU_INIT_POINTER(.cred, &init_cred),                            \
+        RCU_POINTER_INITIALIZER(real_cred, &init_cred),                 \
+        RCU_POINTER_INITIALIZER(cred, &init_cred),                      \
         .comm           = INIT_TASK_COMM,                               \
         .thread         = INIT_THREAD,                                  \
         .fs             = &init_fs,                                     \