aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-01-25 15:08:28 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-25 15:08:28 -0500
commit02b67cc3ba36bdba351d6c3a00593f4ec550d9d3 (patch)
tree5185ad2d780974dc864f12d81d6c8b9fec73097b /kernel
parent03319ec8b06849051747a17aa2a0f9aba9277980 (diff)
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')
-rw-r--r--kernel/sched.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index b9ee0f4db66a..6ee37602a6d8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4678,7 +4678,8 @@ static void __cond_resched(void)
4678 } while (need_resched()); 4678 } while (need_resched());
4679} 4679}
4680 4680
4681int __sched cond_resched(void) 4681#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_VOLUNTARY)
4682int __sched _cond_resched(void)
4682{ 4683{
4683 if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) && 4684 if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) &&
4684 system_state == SYSTEM_RUNNING) { 4685 system_state == SYSTEM_RUNNING) {
@@ -4687,7 +4688,8 @@ int __sched cond_resched(void)
4687 } 4688 }
4688 return 0; 4689 return 0;
4689} 4690}
4690EXPORT_SYMBOL(cond_resched); 4691EXPORT_SYMBOL(_cond_resched);
4692#endif
4691 4693
4692/* 4694/*
4693 * cond_resched_lock() - if a reschedule is pending, drop the given lock, 4695 * cond_resched_lock() - if a reschedule is pending, drop the given lock,