summaryrefslogtreecommitdiff
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-01-25 21:08:28 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-25 21:08:28 +0100
commit02b67cc3ba36bdba351d6c3a00593f4ec550d9d3 (patch)
tree5185ad2d780974dc864f12d81d6c8b9fec73097b /kernel/sched.c
parent03319ec8b06849051747a17aa2a0f9aba9277980 (diff)
downloadlinux-3.10-02b67cc3ba36bdba351d6c3a00593f4ec550d9d3.tar.gz
linux-3.10-02b67cc3ba36bdba351d6c3a00593f4ec550d9d3.tar.bz2
linux-3.10-02b67cc3ba36bdba351d6c3a00593f4ec550d9d3.zip
sched: do not do cond_resched() when CONFIG_PREEMPT
Why do we even have cond_resched when real preemption is on? It seems to be a waste of space and time. remove cond_resched with CONFIG_PREEMPT on. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index b9ee0f4db66..6ee37602a6d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4678,7 +4678,8 @@ static void __cond_resched(void)
} while (need_resched());
}
-int __sched cond_resched(void)
+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_VOLUNTARY)
+int __sched _cond_resched(void)
{
if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) &&
system_state == SYSTEM_RUNNING) {
@@ -4687,7 +4688,8 @@ int __sched cond_resched(void)
}
return 0;
}
-EXPORT_SYMBOL(cond_resched);
+EXPORT_SYMBOL(_cond_resched);
+#endif
/*
* cond_resched_lock() - if a reschedule is pending, drop the given lock,