diff --git a/[refs] b/[refs] index 4156634f1610..276d6cb5f275 100644 --- 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 index 4c5ee843d57f..4d39e96044b9 100644 --- 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);