From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hiroshi Shimamoto Subject: [PATCH -rt] sched: remove unneeded #if directive Date: Fri, 17 Oct 2008 18:21:29 -0700 Message-ID: <48F93A19.9070007@ct.jp.nec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org To: Steven Rostedt , Ingo Molnar , Thomas Gleixner , Peter Zijlstra Return-path: Received: from gateway-1237.mvista.com ([63.81.120.158]:20000 "EHLO gateway-1237.mvista.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751168AbYJRBVc (ORCPT ); Fri, 17 Oct 2008 21:21:32 -0400 Sender: linux-rt-users-owner@vger.kernel.org List-ID: From: Hiroshi Shimamoto __cond_resched_spinlock() is in #ifdef CONFIG_PREEMPT_RT. So the following line always true. #if (defined(CONFIG_SMP) && defined(CONFIG_PREEMPT)) || defined(CONFIG_PREEMPT_RT) Signed-off-by: Hiroshi Shimamoto --- kernel/sched.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 0d68e79..2b34f00 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5841,7 +5841,6 @@ EXPORT_SYMBOL(__cond_resched_raw_spinlock); int __cond_resched_spinlock(spinlock_t *lock) { -#if (defined(CONFIG_SMP) && defined(CONFIG_PREEMPT)) || defined(CONFIG_PREEMPT_RT) if (lock->break_lock) { lock->break_lock = 0; spin_unlock_no_resched(lock); @@ -5849,7 +5848,7 @@ int __cond_resched_spinlock(spinlock_t *lock) spin_lock(lock); return 1; } -#endif + return 0; } EXPORT_SYMBOL(__cond_resched_spinlock); -- 1.5.6