From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755508Ab0LTKPh (ORCPT ); Mon, 20 Dec 2010 05:15:37 -0500 Received: from canuck.infradead.org ([134.117.69.58]:49790 "EHLO canuck.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755046Ab0LTKPg convert rfc822-to-8bit (ORCPT ); Mon, 20 Dec 2010 05:15:36 -0500 Subject: Re: [GIT PULL] scheduler fixes From: Peter Zijlstra To: Linus Torvalds Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Mike Galbraith , Thomas Gleixner , Andrew Morton In-Reply-To: References: <20101219152713.GA20101@elte.hu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Date: Mon, 20 Dec 2010 11:15:36 +0100 Message-ID: <1292840136.2708.131.camel@laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2010-12-19 at 12:45 -0800, Linus Torvalds wrote: > On Sun, Dec 19, 2010 at 7:27 AM, Ingo Molnar wrote: > > @@ -3943,6 +4128,7 @@ need_resched_nonpreemptible: > > rq->nr_switches++; > > rq->curr = next; > > ++*switch_count; > > + WARN_ON_ONCE(test_tsk_need_resched(next)); > > > > context_switch(rq, prev, next); /* unlocks the rq */ > > /* > > diff --git a/kernel/timer.c b/kern > > Please don't add like this in an -rc. It looks like it's some > debugging aid, I don't think it should have gone in now. > Correct, I did ask Ingo to remove that line before he pushed it out to you. Anyway, it seems to be sorted now. Sorry for the bother.