Skip to content

Commit 4e32747

Browse files
committed
init_task: Remove redundant INIT_TASK_RCU_TREE_PREEMPT() macro
Back in the dim distant past, the task_struct structure's RCU-related fields optionally included those needed for CONFIG_RCU_BOOST, even in CONFIG_PREEMPT_RCU builds. The INIT_TASK_RCU_TREE_PREEMPT() macro was used to provide initializers for those optional CONFIG_RCU_BOOST fields. However, the CONFIG_RCU_BOOST fields are now included unconditionally in CONFIG_PREEMPT_RCU builds, so there is no longer any need fro the INIT_TASK_RCU_TREE_PREEMPT() macro. This commit therefore removes it in favor of initializing the ->rcu_blocked_node field directly in the INIT_TASK_RCU_PREEMPT() macro. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent e2c75fc commit 4e32747

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

include/linux/init_task.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,12 @@ extern struct group_info init_groups;
125125
#define INIT_IDS
126126
#endif
127127

128-
#ifdef CONFIG_PREEMPT_RCU
129-
#define INIT_TASK_RCU_TREE_PREEMPT() \
130-
.rcu_blocked_node = NULL,
131-
#else
132-
#define INIT_TASK_RCU_TREE_PREEMPT(tsk)
133-
#endif
134128
#ifdef CONFIG_PREEMPT_RCU
135129
#define INIT_TASK_RCU_PREEMPT(tsk) \
136130
.rcu_read_lock_nesting = 0, \
137131
.rcu_read_unlock_special.s = 0, \
138132
.rcu_node_entry = LIST_HEAD_INIT(tsk.rcu_node_entry), \
139-
INIT_TASK_RCU_TREE_PREEMPT()
133+
.rcu_blocked_node = NULL,
140134
#else
141135
#define INIT_TASK_RCU_PREEMPT(tsk)
142136
#endif

0 commit comments

Comments
 (0)