aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-07-16 09:44:29 -0400
committerIngo Molnar <mingo@elte.hu>2009-07-18 09:51:41 -0400
commite09758fae8ccde97e026c704319eaa18d488dc86 (patch)
treeb2605cb49f9ac5a5d723cde13e14b5380ef9ed86 /kernel/sched.c
parent4b2155678d7cc7b5f45d6b36049091376c3408a2 (diff)
sched: Cover the CONFIG_DEBUG_SPINLOCK_SLEEP off-case for __might_sleep()
Cover the off case for __might_sleep(), so that we avoid #ifdefs in files that make use of it. Especially, this prepares for the __might_sleep() pull up on cond_resched(). Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1247725694-6082-3-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 4d39e96044b9..370a6c31c5e1 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6610,9 +6610,8 @@ static inline int should_resched(void)
6610 6610
6611static void __cond_resched(void) 6611static void __cond_resched(void)
6612{ 6612{
6613#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
6614 __might_sleep(__FILE__, __LINE__); 6613 __might_sleep(__FILE__, __LINE__);
6615#endif 6614
6616 add_preempt_count(PREEMPT_ACTIVE); 6615 add_preempt_count(PREEMPT_ACTIVE);
6617 schedule(); 6616 schedule();
6618 sub_preempt_count(PREEMPT_ACTIVE); 6617 sub_preempt_count(PREEMPT_ACTIVE);