From owner-svn-src-head@FreeBSD.ORG  Thu Jul 29 17:37:35 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 F0139106564A;
	Thu, 29 Jul 2010 17:37:35 +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 DF9A78FC0A;
	Thu, 29 Jul 2010 17:37:35 +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 o6THbZ10008600;
	Thu, 29 Jul 2010 17:37:35 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6THbZIl008598;
	Thu, 29 Jul 2010 17:37:35 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201007291737.o6THbZIl008598@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 29 Jul 2010 17:37:35 +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: r210620 - head/sys/x86/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: Thu, 29 Jul 2010 17:37:36 -0000

Author: jhb
Date: Thu Jul 29 17:37:35 2010
New Revision: 210620
URL: http://svn.freebsd.org/changeset/base/210620

Log:
  When performing a sanity check on the SRAT table to ensure that each
  memory domain has an assigned CPU, ignore disabled CPUs.  Previously
  disabled CPUs were counted as being in domain 0.
  
  Reported by:	mdf

Modified:
  head/sys/x86/acpica/srat.c

Modified: head/sys/x86/acpica/srat.c
==============================================================================
--- head/sys/x86/acpica/srat.c	Thu Jul 29 17:03:27 2010	(r210619)
+++ head/sys/x86/acpica/srat.c	Thu Jul 29 17:37:35 2010	(r210620)
@@ -150,7 +150,8 @@ check_domains(void)
 	for (i = 0; i < num_mem; i++) {
 		found = 0;
 		for (j = 0; j <= MAX_APIC_ID; j++)
-			if (cpus[j].domain == mem_info[i].domain) {
+			if (cpus[j].enabled &&
+			    cpus[j].domain == mem_info[i].domain) {
 				cpus[j].has_memory = 1;
 				found++;
 			}