rcu: Remove CONFIG_PREEMPT_RCU

[~andy/linux] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 7fc01b13be43cfdd7b089b2e8498971f6440d253..79d4baee31b681b65e2d2513a5279fb12459a59f 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -94,6 +94,16 @@ extern struct group_info init_groups;
 # define CAP_INIT_BSET  CAP_INIT_EFF_SET
 #endif
 
+#ifdef CONFIG_TREE_PREEMPT_RCU
+#define INIT_TASK_RCU_PREEMPT(tsk)                                     \
+       .rcu_read_lock_nesting = 0,                                     \
+       .rcu_read_unlock_special = 0,                                   \
+       .rcu_blocked_cpu = -1,                                          \
+       .rcu_node_entry = LIST_HEAD_INIT(tsk.rcu_node_entry),
+#else
+#define INIT_TASK_RCU_PREEMPT(tsk)
+#endif
+
 extern struct cred init_cred;
 
 #ifdef CONFIG_PERF_COUNTERS
@@ -173,6 +183,7 @@ extern struct cred init_cred;
        INIT_LOCKDEP                                                    \
        INIT_FTRACE_GRAPH                                               \
        INIT_TRACE_RECURSION                                            \
+       INIT_TASK_RCU_PREEMPT(tsk)                                      \
 }