[PATCH -rt] sched: remove unneeded #if directive

[Hiroshi Shimamoto]

From: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>

__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 <h-shimamoto@xxxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/