---

yaml --- r: 158323 b: refs/heads/master c: 4b21556 h: refs/heads/master i: 158321: f632d48 158319: c7461e1 v: v3
git-mirror · Jul 18, 2009 · 7fd1349 · 7fd1349
1 parent 8c999d0
commit 7fd1349
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7aaaa6934636d7a6cadd9e2a05250fbb6a34f65
+refs/heads/master: 4b2155678d7cc7b5f45d6b36049091376c3408a2
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -6613,11 +6613,6 @@ static void __cond_resched(void)
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
 	__might_sleep(__FILE__, __LINE__);
 #endif
-	/*
-	 * The BKS might be reacquired before we have dropped
-	 * PREEMPT_ACTIVE, which could trigger a second
-	 * cond_resched() call.
-	 */
 	add_preempt_count(PREEMPT_ACTIVE);
 	schedule();
 	sub_preempt_count(PREEMPT_ACTIVE);