Revert bus_get_cpus() for now.

I really thought I had run this through the tinderbox before committing,
but many places need <sys/types.h> -> <sys/param.h> for <sys/bus.h> now.

2 files changed, 0 insertions, 72 deletions

diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index f0115e8..56673a4 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 a3917c8..1202903 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>
@@ -4113,23 +4111,6 @@ bus_generic_describe_intr(device_t dev, device_t child, struct resource *irq,
 }
 
 /**
- * @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().
  *
  * This simple implementation of BUS_GET_DMA_TAG() simply calls the
@@ -4639,23 +4620,6 @@ bus_child_location_str(device_t child, char *buf, size_t 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().
  *
  * This function simply calls the BUS_GET_DMA_TAG() method of the
@@ -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
 };