From owner-svn-src-stable@FreeBSD.ORG  Mon Mar 30 18:38:03 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECB6E1065676;
	Mon, 30 Mar 2009 18:38:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D94638FC18;
	Mon, 30 Mar 2009 18:38:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2UIc32V074848;
	Mon, 30 Mar 2009 18:38:03 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2UIc3re074847;
	Mon, 30 Mar 2009 18:38:03 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903301838.n2UIc3re074847@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 30 Mar 2009 18:38:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190567 - in stable/6/sys: . contrib/pf dev/acpica
	dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Mar 2009 18:38:05 -0000

Author: jhb
Date: Mon Mar 30 18:38:03 2009
New Revision: 190567
URL: http://svn.freebsd.org/changeset/base/190567

Log:
  MFC: Move the code to update cpu_cx_count out of acpi_cpu_generic_cx_probe()
  and into acpi_cpu_startup() which is where all the other code to update this
  global variable lives.  This fixes a bug where cpu_cx_count was not updated
  correctly if acpi_cpu_generic_cx_probe() returned early.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/acpica/acpi_cpu.c
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/6/sys/dev/acpica/acpi_cpu.c	Mon Mar 30 18:33:04 2009	(r190566)
+++ stable/6/sys/dev/acpica/acpi_cpu.c	Mon Mar 30 18:38:03 2009	(r190567)
@@ -608,10 +608,6 @@ acpi_cpu_generic_cx_probe(struct acpi_cp
 	    sc->cpu_cx_count++;
 	}
     }
-
-    /* Update the largest cx_count seen so far */
-    if (sc->cpu_cx_count > cpu_cx_count)
-	cpu_cx_count = sc->cpu_cx_count;
 }
 
 /*
@@ -751,6 +747,8 @@ acpi_cpu_startup(void *arg)
 	for (i = 0; i < cpu_ndevices; i++) {
 	    sc = device_get_softc(cpu_devices[i]);
 	    acpi_cpu_generic_cx_probe(sc);
+	    if (sc->cpu_cx_count > cpu_cx_count)
+		    cpu_cx_count = sc->cpu_cx_count;
 	}
 
 	/*