From owner-svn-src-head@FreeBSD.ORG  Wed Sep 22 11:32:22 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 803E31065670;
	Wed, 22 Sep 2010 11:32:22 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6FB098FC0C;
	Wed, 22 Sep 2010 11:32:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8MBWMn7029535;
	Wed, 22 Sep 2010 11:32:22 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8MBWMru029533;
	Wed, 22 Sep 2010 11:32:22 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201009221132.o8MBWMru029533@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 22 Sep 2010 11:32:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212997 - head/sys/dev/acpica
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2010 11:32:22 -0000

Author: mav
Date: Wed Sep 22 11:32:22 2010
New Revision: 212997
URL: http://svn.freebsd.org/changeset/base/212997

Log:
  Quick fix for unmotivated C2 state usage during boot, introduced at r212541.
  That caused LAPIC timer failure and huge delays during boot on some systems.

Modified:
  head/sys/dev/acpica/acpi_cpu.c

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Wed Sep 22 10:55:33 2010	(r212996)
+++ head/sys/dev/acpica/acpi_cpu.c	Wed Sep 22 11:32:22 2010	(r212997)
@@ -894,7 +894,7 @@ acpi_cpu_idle()
     cx_next_idx = 0;
 #ifndef __ia64__
     if (cpu_disable_deep_sleep)
-	i = sc->cpu_non_c3;
+	i = min(sc->cpu_cx_lowest, sc->cpu_non_c3);
     else
 #endif
 	i = sc->cpu_cx_lowest;