Module Name: src
Committed By: rmind
Date: Mon Jan 30 21:47:24 UTC 2012
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c
Log Message:
acpi_md_ncpus: use kcpuset_attached instead.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/acpi/acpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.2 src/sys/arch/x86/acpi/acpi_machdep.c:1.3
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.2 Fri Jul 1 18:22:39 2011
+++ src/sys/arch/x86/acpi/acpi_machdep.c Mon Jan 30 21:47:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,11 +40,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.2 2011/07/01 18:22:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.3 2012/01/30 21:47:24 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <uvm/uvm_extern.h>
@@ -72,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_machdep
#include "opt_mpbios.h"
#include "opt_acpi.h"
-extern uint32_t cpus_attached;
-
ACPI_STATUS
acpi_md_OsInitialize(void)
{
@@ -280,7 +279,7 @@ acpi_md_OsEnableInterrupt(void)
uint32_t
acpi_md_ncpus(void)
{
- return popcount32(cpus_attached);
+ return kcpuset_countset(kcpuset_attached);
}
void
