From owner-svn-src-stable-8@FreeBSD.ORG  Sun Dec 23 16:11:44 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3EC4394E;
 Sun, 23 Dec 2012 16:11:44 +0000 (UTC) (envelope-from avg@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 2213D8FC0A;
 Sun, 23 Dec 2012 16:11:44 +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 qBNGBh0X024447;
 Sun, 23 Dec 2012 16:11:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBNGBhJ7024446;
 Sun, 23 Dec 2012 16:11:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201212231611.qBNGBhJ7024446@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 23 Dec 2012 16:11:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r244632 - stable/8/sys/dev/acpica
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
 <svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 16:11:44 -0000

Author: avg
Date: Sun Dec 23 16:11:43 2012
New Revision: 244632
URL: http://svnweb.freebsd.org/changeset/base/244632

Log:
  fix r243760 by accounting for cpuset vs cpumask differences
  
  This is a direct commit.
  
  Pointyhat to:	avg

Modified:
  stable/8/sys/dev/acpica/acpi_cpu.c

Modified: stable/8/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi_cpu.c	Sun Dec 23 15:50:37 2012	(r244631)
+++ stable/8/sys/dev/acpica/acpi_cpu.c	Sun Dec 23 16:11:43 2012	(r244632)
@@ -417,9 +417,9 @@ SYSINIT(acpi_cpu, SI_SUB_CONFIGURE, SI_O
 static void
 disable_idle(struct acpi_cpu_softc *sc)
 {
-    cpuset_t cpuset;
+    cpumask_t cpuset;
 
-    CPU_SETOF(sc->cpu_pcpu->pc_cpuid, &cpuset);
+    cpuset = sc->cpu_pcpu->pc_cpumask;
     sc->cpu_disable_idle = TRUE;
 
     /*