Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965315AbbENUIh (ORCPT ); Thu, 14 May 2015 16:08:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53268 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965283AbbENUIb (ORCPT ); Thu, 14 May 2015 16:08:31 -0400 Date: Thu, 14 May 2015 13:07:21 -0700 From: tip-bot for Nikolay Borisov Message-ID: 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 Reply-To: mingo@kernel.org, efault@gmx.de, tglx@linutronix.de, bp@alien8.de, n.borisov@siteground.com, peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <1431603061-29408-1-git-send-email-kernel@kyup.com> References: <1431603061-29408-1-git-send-email-kernel@kyup.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched: Remove redundant #ifdef Git-Commit-ID: 8c8a457a60050d5922676f81913d87e4af6fd97b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1656 Lines: 43 Commit-ID: 8c8a457a60050d5922676f81913d87e4af6fd97b Gitweb: http://git.kernel.org/tip/8c8a457a60050d5922676f81913d87e4af6fd97b Author: Nikolay Borisov AuthorDate: Thu, 14 May 2015 14:31:01 +0300 Committer: Ingo Molnar 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 Cc: Borislav Petkov Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1431603061-29408-1-git-send-email-kernel@kyup.com Signed-off-by: Ingo Molnar --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/