Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Aug 2020 00:03:24 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r364442 - in head/sys: cam cddl/compat/opensolaris/kern geom kern net netinet
Message-ID:  <202008210003.07L03O9C064200@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Fri Aug 21 00:03:24 2020
New Revision: 364442
URL: https://svnweb.freebsd.org/changeset/base/364442

Log:
  Use devctl.h instead of bus.h to reduce newbus pollution.
  
  There's no need for these parts of the kernel to know about newbus,
  so narrow what is included to devctl.h for device_notify_*.
  
  Suggested by: kib@

Modified:
  head/sys/cam/cam_periph.c
  head/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
  head/sys/geom/geom_dev.c
  head/sys/geom/geom_disk.c
  head/sys/kern/kern_conf.c
  head/sys/kern/kern_rctl.c
  head/sys/kern/kern_sig.c
  head/sys/kern/vfs_mount.c
  head/sys/net/if_ethersubr.c
  head/sys/netinet/ip_carp.c

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/cam/cam_periph.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -39,12 +39,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/conf.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/devicestat.h>
-#include <sys/bus.h>
 #include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <vm/vm.h>

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/sbuf.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/nvpair.h>
 #include <sys/sunddi.h>
 #include <sys/sysevent.h>

Modified: head/sys/geom/geom_dev.c
==============================================================================
--- head/sys/geom/geom_dev.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/geom/geom_dev.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/ctype.h>
 #include <sys/bio.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/geom/geom_disk.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bio.h>
-#include <sys/bus.h>
 #include <sys/ctype.h>
+#include <sys/devctl.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/sbuf.h>

Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/kern/kern_conf.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
 #include <sys/bio.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/module.h>

Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/kern/kern_rctl.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/refcount.h>

Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/kern/kern_sig.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
 #include <sys/acct.h>
-#include <sys/bus.h>
 #include <sys/capsicum.h>
 #include <sys/compressor.h>
 #include <sys/condvar.h>
+#include <sys/devctl.h>
 #include <sys/event.h>
 #include <sys/fcntl.h>
 #include <sys/imgact.h>

Modified: head/sys/kern/vfs_mount.c
==============================================================================
--- head/sys/kern/vfs_mount.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/kern/vfs_mount.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/smp.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/eventhandler.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>

Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/net/if_ethersubr.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -40,7 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/eventhandler.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Thu Aug 20 20:31:47 2020	(r364441)
+++ head/sys/netinet/ip_carp.c	Fri Aug 21 00:03:24 2020	(r364442)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/limits.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008210003.07L03O9C064200>