From owner-svn-src-head@freebsd.org  Thu Apr 28 18:53:15 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E83E3B1F17D;
 Thu, 28 Apr 2016 18:53:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B903519C8;
 Thu, 28 Apr 2016 18:53:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3SIrEgV036590;
 Thu, 28 Apr 2016 18:53:14 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3SIrEMG036589;
 Thu, 28 Apr 2016 18:53:14 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201604281853.u3SIrEMG036589@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 28 Apr 2016 18:53:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298754 - head/sys/dev/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Apr 2016 18:53:16 -0000

Author: jhb
Date: Thu Apr 28 18:53:14 2016
New Revision: 298754
URL: https://svnweb.freebsd.org/changeset/base/298754

Log:
  Only count CPU devices that are using the ACPI CPU driver.
  
  Arguably we should only be doing the probe/attach to children of
  these devices as well.
  
  Tested by:	Michal Stanek <mst_semihalf.com> (arm64)
  Differential Revision:	https://reviews.freebsd.org/D6133

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

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Thu Apr 28 18:41:55 2016	(r298753)
+++ head/sys/dev/acpica/acpi_cpu.c	Thu Apr 28 18:53:14 2016	(r298754)
@@ -429,7 +429,8 @@ acpi_cpu_postattach(void *unused __unuse
     }
     attached = 0;
     for (i = 0; i < n; i++)
-	if (device_is_attached(devices[i]))
+	if (device_is_attached(devices[i]) &&
+	    device_get_driver(devices[i]) == &acpi_cpu_driver)
 	    attached = 1;
     for (i = 0; i < n; i++)
 	bus_generic_probe(devices[i]);