diff options
| author | Nikolay Borisov <n.borisov@siteground.com> | 2015-05-14 14:31:01 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-14 20:04:43 +0200 |
| commit | 8c8a457a60050d5922676f81913d87e4af6fd97b (patch) | |
| tree | 76b77e80ee17ab49a1e2f3c8533217e9c670477a /include/linux/sched.h | |
| parent | 920ce39f6c204d4ce4d8acebe7522f0dfa95f662 (diff) | |
| download | op-kernel-dev-8c8a457a60050d5922676f81913d87e4af6fd97b.zip op-kernel-dev-8c8a457a60050d5922676f81913d87e4af6fd97b.tar.gz | |
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 <n.borisov@siteground.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1431603061-29408-1-git-send-email-kernel@kyup.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | 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 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 |
