2015-05-14 11:31:18

by Angel Shtilianov

Subject: [PATCH] sched: Remove redundant #ifdef

From: Nikolay Borisov <[email protected]>

2 Adjacent members in task_struct were guarded
by the same define, so no need to have the define twice

Signed-off-by: Nikolay Borisov <[email protected]>
---
include/linux/sched.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 26a2e61..272d14e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1334,8 +1334,6 @@ struct task_struct {
int rcu_read_lock_nesting;
union rcu_special rcu_read_unlock_special;
struct list_head rcu_node_entry;
-#endif /* #ifdef CONFIG_PREEMPT_RCU */
-#ifdef CONFIG_PREEMPT_RCU
struct rcu_node *rcu_blocked_node;
#endif /* #ifdef CONFIG_PREEMPT_RCU */
#ifdef CONFIG_TASKS_RCU
--
1.7.1

2015-05-14 20:08:37

by tip-bot for Vasyl Gomonovych

Subject: [tip:sched/core] sched: Remove redundant #ifdef

Commit-ID: 8c8a457a60050d5922676f81913d87e4af6fd97b
Gitweb: http://git.kernel.org/tip/8c8a457a60050d5922676f81913d87e4af6fd97b
Author: Nikolay Borisov <[email protected]>
AuthorDate: Thu, 14 May 2015 14:31:01 +0300
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 14 May 2015 20:04:43 +0200

sched: Remove redundant #ifdef

Two adjacent members in task_struct were guarded
by the same #define, so we can merge the two blocks.

Signed-off-by: Nikolay Borisov <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
include/linux/sched.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0eceeec..5f8defa 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1398,8 +1398,6 @@ struct task_struct {
int rcu_read_lock_nesting;
union rcu_special rcu_read_unlock_special;
struct list_head rcu_node_entry;
-#endif /* #ifdef CONFIG_PREEMPT_RCU */
-#ifdef CONFIG_PREEMPT_RCU
struct rcu_node *rcu_blocked_node;
#endif /* #ifdef CONFIG_PREEMPT_RCU */
#ifdef CONFIG_TASKS_RCU