diff --git a/share/man/man9/BUS_GET_CPUS.9 b/share/man/man9/BUS_GET_CPUS.9
deleted file mode 100644
index a081d5d001b3..000000000000
--- a/share/man/man9/BUS_GET_CPUS.9
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" Copyright (c) 2016 John H. Baldwin <jhb@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 1, 2016
-.Dt BUS_GET_CPUS 9
-.Os
-.Sh NAME
-.Nm BUS_GET_CPUS ,
-.Nm bus_get_cpus
-.Nd "request a set of device-specific CPUs"
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/bus.h
-.Ft int
-.Fo BUS_GET_CPUS
-.Fa "device_t dev" "device_t child" "enum cpu_sets op" "size_t setsize"
-.Fa "cpuset_t *cpuset"
-.Fc
-.Ft int
-.Fo bus_get_cpus
-.Fa "device_t dev" "enum cpu_sets op" "size_t setsize" "cpuset_t *cpuset"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn BUS_GET_CPUS
-method queries the parent bus device for a set of device-specific CPUs.
-The
-.Fa op
-argument specifies which set of CPUs to retrieve.
-If successful,
-the requested set of CPUs are returned in
-.Fa cpuset .
-The
-.Fa setsize
-argument specifies the size in bytes of the set passed in
-.Fa cpuset .
-.Pp
-.Fn BUS_GET_CPUS
-supports querying different types of CPU sets via the the
-.Fa op argument.
-Not all set types are supported for every device.
-If a set type is not supported,
-.Fn BUS_GET_CPUS
-fails with
-.Er EINVAL .
-These set types are supported:
-.Bl -tag -width ".Dv LOCAL_CPUS"
-.It Dv LOCAL_CPUS
-The set of CPUs that are local to the device.
-If a device is closer to a specific memory domain in a non-uniform memory
-architecture system
-.Pq NUMA ,
-this will return the set of CPUs in that memory domain.
-.It Dv INTR_CPUS
-The preferred set of CPUs that this device should use for device interrupts.
-This set type must be supported by all bus drivers.
-.El
-.Pp
-The
-.Fn bus_get_cpus
-function is a simple wrapper around
-.Fn BUS_GET_CPUS .
-.Sh RETURN VALUES
-Zero is returned on success, otherwise an appropriate error is returned.
-.Sh SEE ALSO
-.Xr cpuset 2 ,
-.Xr BUS_BIND_INTR 9 ,
-.Xr device 9
-.Sh HISTORY
-The
-.Fn BUS_GET_CPUS
-method and
-.Fn bus_get_cpus
-function first appeared in
-.Fx 11.0 .
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 21e8af4cf9e7..20ff6ae0efb4 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -42,7 +42,6 @@ MAN=	accept_filter.9 \
 	bus_generic_print_child.9 \
 	bus_generic_read_ivar.9 \
 	bus_generic_shutdown.9 \
-	BUS_GET_CPUS.9 \
 	bus_get_resource.9 \
 	BUS_NEW_PASS.9 \
 	BUS_PRINT_CHILD.9 \
@@ -503,7 +502,6 @@ MLINKS+=bus_dma.9 busdma.9 \
 	bus_dma.9 bus_dma_tag_create.9 \
 	bus_dma.9 bus_dma_tag_destroy.9
 MLINKS+=bus_generic_read_ivar.9 bus_generic_write_ivar.9
-MLINKS+=BUS_GET_CPUS.9 bus_get_cpus.9
 MLINKS+=BUS_READ_IVAR.9 BUS_WRITE_IVAR.9
 MLINKS+=BUS_SETUP_INTR.9 bus_setup_intr.9 \
 	BUS_SETUP_INTR.9 BUS_TEARDOWN_INTR.9 \
diff --git a/sys/amd64/include/intr_machdep.h b/sys/amd64/include/intr_machdep.h
index 8de839b188e7..22f9a49c1d65 100644
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -143,9 +143,6 @@ struct nmi_pcpu {
 	register_t	__padding;	/* pad to 16 bytes */
 };
 
-#ifdef SMP
-extern cpuset_t intr_cpus;
-#endif
 extern struct mtx icu_lock;
 extern int elcr_found;
 
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 6f185c949d83..84468e583567 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -211,7 +211,6 @@ static device_method_t acpi_methods[] = {
     DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
     DEVMETHOD(bus_hint_device_unit,	acpi_hint_device_unit),
-    DEVMETHOD(bus_get_cpus,		acpi_get_cpus),
     DEVMETHOD(bus_get_domain,		acpi_get_domain),
 
     /* ACPI bus */
@@ -1078,79 +1077,52 @@ acpi_hint_device_unit(device_t acdev, device_t child, const char *name,
 }
 
 /*
- * Fetch the NUMA domain for a device by mapping the value returned by
- * _PXM to a NUMA domain.  If the device does not have a _PXM method,
- * -2 is returned.  If any other error occurs, -1 is returned.
+ * Fetch the VM domain for the given device 'dev'.
+ *
+ * Return 1 + domain if there's a domain, 0 if not found;
+ * -1 upon an error.
  */
-static int
-acpi_parse_pxm(device_t dev)
+int
+acpi_parse_pxm(device_t dev, int *domain)
 {
 #ifdef DEVICE_NUMA
-	ACPI_HANDLE handle;
-	ACPI_STATUS status;
-	int pxm;
+	ACPI_HANDLE h;
+	int d, pxm;
 
-	handle = acpi_get_handle(dev);
-	if (handle == NULL)
-		return (-2);
-	status = acpi_GetInteger(handle, "_PXM", &pxm);
-	if (ACPI_SUCCESS(status))
-		return (acpi_map_pxm_to_vm_domainid(pxm));
-	if (status == AE_NOT_FOUND)
-		return (-2);
-#endif
-	return (-1);
-}
-
-int
-acpi_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize,
-    cpuset_t *cpuset)
-{
-	int d, error;
-
-	d = acpi_parse_pxm(child);
-	if (d < 0)
-		return (bus_generic_get_cpus(dev, child, op, setsize, cpuset));
-
-	switch (op) {
-	case LOCAL_CPUS:
-		if (setsize != sizeof(cpuset_t))
-			return (EINVAL);
-		*cpuset = cpuset_domain[d];
-		return (0);
-	case INTR_CPUS:
-		error = bus_generic_get_cpus(dev, child, op, setsize, cpuset);
-		if (error != 0)
-			return (error);
-		if (setsize != sizeof(cpuset_t))
-			return (EINVAL);
-		CPU_AND(cpuset, &cpuset_domain[d]);
-		return (0);
-	default:
-		return (bus_generic_get_cpus(dev, child, op, setsize, cpuset));
+	h = acpi_get_handle(dev);
+	if ((h != NULL) &&
+	    ACPI_SUCCESS(acpi_GetInteger(h, "_PXM", &pxm))) {
+		d = acpi_map_pxm_to_vm_domainid(pxm);
+		if (d < 0)
+			return (-1);
+		*domain = d;
+		return (1);
 	}
+#endif
+
+	return (0);
 }
 
 /*
- * Fetch the NUMA domain for the given device 'dev'.
+ * Fetch the NUMA domain for the given device.
  *
  * If a device has a _PXM method, map that to a NUMA domain.
- * Otherwise, pass the request up to the parent.
- * If there's no matching domain or the domain cannot be
- * determined, return ENOENT.
+ *
+ * If none is found, then it'll call the parent method.
+ * If there's no domain, return ENOENT.
  */
 int
 acpi_get_domain(device_t dev, device_t child, int *domain)
 {
-	int d;
+	int ret;
 
-	d = acpi_parse_pxm(child);
-	if (d >= 0) {
-		*domain = d;
-		return (0);
-	}
-	if (d == -1)
+	ret = acpi_parse_pxm(child, domain);
+	/* Error */
+	if (ret == -1)
 		return (ENOENT);
+	/* Found */
+	if (ret == 1)
+		return (0);
 
 	/* No _PXM node; go up a level */
 	return (bus_generic_get_domain(dev, child, domain));
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 43a523e326ca..44b58044eef2 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -95,7 +95,6 @@ static device_method_t acpi_pci_methods[] = {
 	DEVMETHOD(bus_write_ivar,	acpi_pci_write_ivar),
 	DEVMETHOD(bus_child_deleted,	acpi_pci_child_deleted),
 	DEVMETHOD(bus_child_location_str, acpi_pci_child_location_str_method),
-	DEVMETHOD(bus_get_cpus,		acpi_get_cpus),
 	DEVMETHOD(bus_get_dma_tag,	acpi_pci_get_dma_tag),
 	DEVMETHOD(bus_get_domain,	acpi_get_domain),
 
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index bf1fc79b2d63..ffcb8cafd90d 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -265,11 +265,3 @@ acpi_pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate)
     acpi_device_pwr_for_sleep(acpi_dev, dev, pstate);
     return (0);
 }
-
-int
-acpi_pcib_get_cpus(device_t pcib, device_t dev, enum cpu_sets op,
-    size_t setsize, cpuset_t *cpuset)
-{
-
-	return (bus_get_cpus(pcib, op, setsize, cpuset));
-}
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index c5693dd7ad73..e9bcbd1f35cf 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -130,7 +130,6 @@ static device_method_t acpi_pcib_acpi_methods[] = {
     DEVMETHOD(bus_deactivate_resource,	bus_generic_deactivate_resource),
     DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-    DEVMETHOD(bus_get_cpus,		acpi_pcib_get_cpus),
 
     /* pcib interface */
     DEVMETHOD(pcib_maxslots,		pcib_maxslots),
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index a041bca23708..ca94d38c4778 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -78,7 +78,6 @@ static device_method_t acpi_pcib_pci_methods[] = {
 
     /* Bus interface */
     DEVMETHOD(bus_read_ivar,		acpi_pcib_read_ivar),
-    DEVMETHOD(bus_get_cpus,		acpi_pcib_get_cpus),
 
     /* pcib interface */
     DEVMETHOD(pcib_route_interrupt,	acpi_pcib_pci_route_interrupt),
diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index 1781c637746c..f563e77360e0 100644
--- a/sys/dev/acpica/acpi_pcibvar.h
+++ b/sys/dev/acpica/acpi_pcibvar.h
@@ -36,8 +36,6 @@ void	acpi_pci_link_add_reference(device_t dev, int index, device_t pcib,
     int slot, int pin);
 int	acpi_pci_link_route_interrupt(device_t dev, int index);
 void	acpi_pcib_fetch_prt(device_t bus, ACPI_BUFFER *prt);
-int	acpi_pcib_get_cpus(device_t pcib, device_t dev, enum cpu_sets op,
-    size_t setsize, cpuset_t *cpuset);
 int	acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin,
     ACPI_BUFFER *prtbuf);
 int	acpi_pcib_power_for_sleep(device_t pcib, device_t dev,
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index bdd179b96962..56b634f01a20 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -506,9 +506,8 @@ SYSCTL_DECL(_debug_acpi);
  * Returns the VM domain ID if found, or -1 if not found / invalid.
  */
 int		acpi_map_pxm_to_vm_domainid(int pxm);
-int		acpi_get_cpus(device_t dev, device_t child, enum cpu_sets op,
-		    size_t setsize, cpuset_t *cpuset);
 int		acpi_get_domain(device_t dev, device_t child, int *domain);
+int		acpi_parse_pxm(device_t dev, int *domain);
 
 #endif /* _KERNEL */
 #endif /* !_ACPIVAR_H_ */
diff --git a/sys/dev/drm2/drm_dp_iic_helper.c b/sys/dev/drm2/drm_dp_iic_helper.c
index 1f38bc82b9ff..35318c11c388 100644
--- a/sys/dev/drm2/drm_dp_iic_helper.c
+++ b/sys/dev/drm2/drm_dp_iic_helper.c
@@ -23,7 +23,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/kobj.h>
 #include <sys/bus.h>
 #include <dev/iicbus/iic.h>
diff --git a/sys/dev/drm2/i915/dvo.h b/sys/dev/drm2/i915/dvo.h
index 14eb7feeb631..9b486ced2b09 100644
--- a/sys/dev/drm2/i915/dvo.h
+++ b/sys/dev/drm2/i915/dvo.h
@@ -26,7 +26,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/bus.h>
 #include <dev/iicbus/iic.h>
 #include <dev/iicbus/iiconf.h>
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index f0115e8670a2..56673a4a0374 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -731,21 +731,3 @@ METHOD int get_domain {
 	device_t	_child;
 	int		*_domain;
 } DEFAULT bus_generic_get_domain;
-
-/**
- * @brief Request a set of CPUs
- *
- * @param _dev		the bus device
- * @param _child	the child device
- * @param _op		type of CPUs to request
- * @param _setsize	the size of the set passed in _cpuset
- * @param _cpuset	a pointer to a cpuset to receive the requested
- *			set of CPUs
- */
-METHOD int get_cpus {
-	device_t	_dev;
-	device_t	_child;
-	enum cpu_sets	_op;
-	size_t		_setsize;
-	cpuset_t	*_cpuset;
-} DEFAULT bus_generic_get_cpus;
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index a3917c8be5d2..120290366d44 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -47,10 +47,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/random.h>
 #include <sys/rman.h>
-#include <sys/sbuf.h>
 #include <sys/selinfo.h>
 #include <sys/signalvar.h>
-#include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
@@ -4112,23 +4110,6 @@ bus_generic_describe_intr(device_t dev, device_t child, struct resource *irq,
 	return (EINVAL);
 }
 
-/**
- * @brief Helper function for implementing BUS_GET_CPUS().
- *
- * This simple implementation of BUS_GET_CPUS() simply calls the
- * BUS_GET_CPUS() method of the parent of @p dev.
- */
-int
-bus_generic_get_cpus(device_t dev, device_t child, enum cpu_sets op,
-    size_t setsize, cpuset_t *cpuset)
-{
-
-	/* Propagate up the bus hierarchy until someone handles it. */
-	if (dev->parent != NULL)
-		return (BUS_GET_CPUS(dev->parent, child, op, setsize, cpuset));
-	return (EINVAL);
-}
-
 /**
  * @brief Helper function for implementing BUS_GET_DMA_TAG().
  *
@@ -4638,23 +4619,6 @@ bus_child_location_str(device_t child, char *buf, size_t buflen)
 	return (BUS_CHILD_LOCATION_STR(parent, child, buf, buflen));
 }
 
-/**
- * @brief Wrapper function for BUS_GET_CPUS().
- *
- * This function simply calls the BUS_GET_CPUS() method of the
- * parent of @p dev.
- */
-int
-bus_get_cpus(device_t dev, enum cpu_sets op, size_t setsize, cpuset_t *cpuset)
-{
-	device_t parent;
-
-	parent = device_get_parent(dev);
-	if (parent == NULL)
-		return (EINVAL);
-	return (BUS_GET_CPUS(parent, dev, op, setsize, cpuset));
-}
-
 /**
  * @brief Wrapper function for BUS_GET_DMA_TAG().
  *
@@ -4747,23 +4711,6 @@ root_child_present(device_t dev, device_t child)
 	return (-1);
 }
 
-static int
-root_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize,
-    cpuset_t *cpuset)
-{
-
-	switch (op) {
-	case INTR_CPUS:
-		/* Default to returning the set of all CPUs. */
-		if (setsize != sizeof(cpuset_t))
-			return (EINVAL);
-		*cpuset = all_cpus;
-		return (0);
-	default:
-		return (EINVAL);
-	}
-}
-
 static kobj_method_t root_methods[] = {
 	/* Device interface */
 	KOBJMETHOD(device_shutdown,	bus_generic_shutdown),
@@ -4776,7 +4723,6 @@ static kobj_method_t root_methods[] = {
 	KOBJMETHOD(bus_write_ivar,	bus_generic_write_ivar),
 	KOBJMETHOD(bus_setup_intr,	root_setup_intr),
 	KOBJMETHOD(bus_child_present,	root_child_present),
-	KOBJMETHOD(bus_get_cpus,	root_get_cpus),
 
 	KOBJMETHOD_END
 };
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index db86aeda1846..4992cdb4847e 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -32,7 +32,6 @@
 #include <machine/_limits.h>
 #include <machine/_bus.h>
 #include <sys/_bus_dma.h>
-#include <sys/_cpuset.h>
 #include <sys/ioccom.h>
 
 /**
@@ -273,16 +272,6 @@ enum intr_polarity {
 	INTR_POLARITY_LOW = 2
 };
 
-/**
- * CPU sets supported by bus_get_cpus().  Note that not all sets may be
- * supported for a given device.  If a request is not supported by a
- * device (or its parents), then bus_get_cpus() will fail with EINVAL.
- */
-enum cpu_sets {
-	LOCAL_CPUS = 0,
-	INTR_CPUS
-};
-
 typedef int (*devop_t)(void);
 
 /**
@@ -399,8 +388,6 @@ int	bus_generic_deactivate_resource(device_t dev, device_t child, int type,
 					int rid, struct resource *r);
 int	bus_generic_detach(device_t dev);
 void	bus_generic_driver_added(device_t dev, driver_t *driver);
-int	bus_generic_get_cpus(device_t dev, device_t child, enum cpu_sets op,
-			     size_t setsize, cpuset_t *cpuset);
 bus_dma_tag_t
 	bus_generic_get_dma_tag(device_t dev, device_t child);
 bus_space_tag_t
@@ -470,8 +457,6 @@ int	bus_activate_resource(device_t dev, int type, int rid,
 			      struct resource *r);
 int	bus_deactivate_resource(device_t dev, int type, int rid,
 				struct resource *r);
-int	bus_get_cpus(device_t dev, enum cpu_sets op, size_t setsize,
-		     cpuset_t *cpuset);
 bus_dma_tag_t bus_get_dma_tag(device_t dev);
 bus_space_tag_t bus_get_bus_tag(device_t dev);
 int	bus_get_domain(device_t dev, int *domain);
diff --git a/sys/x86/acpica/OsdEnvironment.c b/sys/x86/acpica/OsdEnvironment.c
index 8a40967fabd6..ab8a7fbaacc0 100644
--- a/sys/x86/acpica/OsdEnvironment.c
+++ b/sys/x86/acpica/OsdEnvironment.c
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index 36a3441db2fd..667888737f8a 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -490,7 +490,7 @@ DB_SHOW_COMMAND(irqs, db_show_irqs)
  * allocate CPUs round-robin.
  */
 
-cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1);
+static cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1);
 static int current_cpu;
 
 /*
diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c
index 345b70f8625e..5d4c37e60802 100644
--- a/sys/x86/x86/nexus.c
+++ b/sys/x86/x86/nexus.c
@@ -127,8 +127,6 @@ static	int nexus_set_resource(device_t, device_t, int, int,
 static	int nexus_get_resource(device_t, device_t, int, int,
 			       rman_res_t *, rman_res_t *);
 static void nexus_delete_resource(device_t, device_t, int, int);
-static	int nexus_get_cpus(device_t, device_t, enum cpu_sets, size_t,
-			   cpuset_t *);
 #ifdef DEV_APIC
 static	int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs);
 static	int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs);
@@ -165,7 +163,6 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_set_resource,	nexus_set_resource),
 	DEVMETHOD(bus_get_resource,	nexus_get_resource),
 	DEVMETHOD(bus_delete_resource,	nexus_delete_resource),
-	DEVMETHOD(bus_get_cpus,		nexus_get_cpus),
 
 	/* pcib interface */
 #ifdef DEV_APIC
@@ -622,24 +619,6 @@ nexus_delete_resource(device_t dev, device_t child, int type, int rid)
 	resource_list_delete(rl, type, rid);
 }
 
-static int
-nexus_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize,
-    cpuset_t *cpuset)
-{
-
-	switch (op) {
-#ifdef SMP
-	case INTR_CPUS:
-		if (setsize != sizeof(cpuset_t))
-			return (EINVAL);
-		*cpuset = intr_cpus;
-		return (0);
-#endif
-	default:
-		return (bus_generic_get_cpus(dev, child, op, setsize, cpuset));
-	}
-}
-
 /* Called from the MSI code to add new IRQs to the IRQ rman. */
 void
 nexus_add_irq(u_long irq)