From: tip-bot for Nikolay Borisov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
hpa@zytor.com, torvalds@linux-foundation.org,
n.borisov@siteground.com, bp@alien8.de, mingo@kernel.org,
tglx@linutronix.de, efault@gmx.de
Subject: [tip:sched/core] sched: Remove redundant #ifdef
Date: Thu, 14 May 2015 13:07:21 -0700 [thread overview]
Message-ID: <tip-8c8a457a60050d5922676f81913d87e4af6fd97b@git.kernel.org> (raw)
In-Reply-To: <1431603061-29408-1-git-send-email-kernel@kyup.com>
Commit-ID: 8c8a457a60050d5922676f81913d87e4af6fd97b
Gitweb: http://git.kernel.org/tip/8c8a457a60050d5922676f81913d87e4af6fd97b
Author: Nikolay Borisov <n.borisov@siteground.com>
AuthorDate: Thu, 14 May 2015 14:31:01 +0300
Committer: Ingo Molnar <mingo@kernel.org>
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 <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>
---
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
prev parent reply other threads:[~2015-05-14 20:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 11:31 [PATCH] " kernel
2015-05-14 20:07 ` tip-bot for Nikolay Borisov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-8c8a457a60050d5922676f81913d87e4af6fd97b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=n.borisov@siteground.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome