* [PATCH -rt] sched: remove unneeded #if directive
@ 2008-10-18 1:21 Hiroshi Shimamoto
0 siblings, 0 replies; only message in thread
From: Hiroshi Shimamoto @ 2008-10-18 1:21 UTC (permalink / raw)
To: Steven Rostedt, Ingo Molnar, Thomas Gleixner, Peter Zijlstra
Cc: linux-kernel, linux-rt-users
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
__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@ct.jp.nec.com>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-18 1:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-18 1:21 [PATCH -rt] sched: remove unneeded #if directive Hiroshi Shimamoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).