Merge branch '4.0.8-rt6'

[zynq/linux.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 696d22312b3199ed2f515240111a669a35d48934..4a77d39ff7dd7992b5d5669c9a7dbeacdc364b23 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -147,9 +147,16 @@ extern struct task_group root_task_group;
 # define INIT_PERF_EVENTS(tsk)
 #endif
 
+#ifdef CONFIG_PREEMPT_RT_BASE
+# define INIT_TIMER_LIST               .posix_timer_list = NULL,
+#else
+# define INIT_TIMER_LIST
+#endif
+
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
 # define INIT_VTIME(tsk)                                               \
-       .vtime_seqlock = __SEQLOCK_UNLOCKED(tsk.vtime_seqlock), \
+       .vtime_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.vtime_lock), \
+       .vtime_seq = SEQCNT_ZERO(tsk.vtime_seq),                        \
        .vtime_snap = 0,                                \
        .vtime_snap_whence = VTIME_SYS,
 #else
@@ -238,6 +245,7 @@ extern struct task_group root_task_group;
        .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
        .pi_lock        = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),        \
        .timer_slack_ns = 50000, /* 50 usec default slack */            \
+       INIT_TIMER_LIST                                                 \
        .pids = {                                                       \
                [PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),            \
                [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),           \