From owner-svn-src-all@FreeBSD.ORG  Thu Nov 15 14:10:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 94DADFB;
 Thu, 15 Nov 2012 14:10:51 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7AAEA8FC15;
 Thu, 15 Nov 2012 14:10:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFEAp0t095347;
 Thu, 15 Nov 2012 14:10:51 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFEAp5M095346;
 Thu, 15 Nov 2012 14:10:51 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201211151410.qAFEAp5M095346@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 15 Nov 2012 14:10:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243069 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 14:10:51 -0000

Author: mav
Date: Thu Nov 15 14:10:51 2012
New Revision: 243069
URL: http://svnweb.freebsd.org/changeset/base/243069

Log:
  Fix bug in r242852 that prevented CPU from becoming idle if kernel built
  without SMP support.

Modified:
  head/sys/kern/sched_ule.c

Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c	Thu Nov 15 07:48:44 2012	(r243068)
+++ head/sys/kern/sched_ule.c	Thu Nov 15 14:10:51 2012	(r243069)
@@ -2636,8 +2636,10 @@ sched_idletd(void *dummy)
 			if (tdq_idled(tdq) == 0)
 				continue;
 		}
-#endif
 		switchcnt = tdq->tdq_switchcnt + tdq->tdq_oldswitchcnt;
+#else
+		oldswitchcnt = switchcnt;
+#endif
 		/*
 		 * If we're switching very frequently, spin while checking
 		 * for load rather than entering a low power state that