svn commit: r348064 - in head/sys: arm64/arm64 dev/acpica dev/ixgbe fs/unionfs kern mips/mips riscv/riscv ufs/ffs ufs/ufs vm

Conrad Meyer cem at FreeBSD.org
Tue May 21 20:38:54 UTC 2019


Author: cem
Date: Tue May 21 20:38:48 2019
New Revision: 348064
URL: https://svnweb.freebsd.org/changeset/base/348064

Log:
  Include ktr.h in more compilation units
  
  Similar to r348026, exhaustive search for uses of CTRn() and cross reference
  ktr.h includes.  Where it was obvious that an OS compat header of some kind
  included ktr.h indirectly, .c files were left alone.  Some of these files
  clearly got ktr.h via header pollution in some scenarios, or tinderbox would
  not be passing prior to this revision, but go ahead and explicitly include it
  in files using it anyway.
  
  Like r348026, these CUs did not show up in tinderbox as missing the include.
  
  Reported by:	peterj (arm64/mp_machdep.c)
  X-MFC-With:	r347984
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/arm64/arm64/mp_machdep.c
  head/sys/arm64/arm64/trap.c
  head/sys/dev/acpica/acpi_ec.c
  head/sys/dev/ixgbe/if_sriov.c
  head/sys/fs/unionfs/union_subr.c
  head/sys/kern/kern_exit.c
  head/sys/kern/subr_eventhandler.c
  head/sys/kern/sys_process.c
  head/sys/kern/vfs_bio.c
  head/sys/kern/vfs_cache.c
  head/sys/kern/vfs_mount.c
  head/sys/kern/vfs_subr.c
  head/sys/kern/vfs_vnops.c
  head/sys/mips/mips/freebsd32_machdep.c
  head/sys/mips/mips/pm_machdep.c
  head/sys/mips/mips/trap.c
  head/sys/riscv/riscv/trap.c
  head/sys/ufs/ffs/ffs_vfsops.c
  head/sys/ufs/ufs/ufs_extattr.c
  head/sys/vm/vnode_pager.c

Modified: head/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- head/sys/arm64/arm64/mp_machdep.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/arm64/arm64/mp_machdep.c	Tue May 21 20:38:48 2019	(r348064)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/arm64/arm64/trap.c	Tue May 21 20:38:48 2019	(r348064)
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pioctl.h>

Modified: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/dev/acpica/acpi_ec.c	Tue May 21 20:38:48 2019	(r348064)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/bus.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>

Modified: head/sys/dev/ixgbe/if_sriov.c
==============================================================================
--- head/sys/dev/ixgbe/if_sriov.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/dev/ixgbe/if_sriov.c	Tue May 21 20:38:48 2019	(r348064)
@@ -37,6 +37,8 @@
 
 #ifdef PCI_IOV
 
+#include <sys/ktr.h>
+
 MALLOC_DEFINE(M_IXGBE_SRIOV, "ix_sriov", "ix SR-IOV allocations");
 
 /************************************************************************

Modified: head/sys/fs/unionfs/union_subr.c
==============================================================================
--- head/sys/fs/unionfs/union_subr.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/fs/unionfs/union_subr.c	Tue May 21 20:38:48 2019	(r348064)
@@ -41,6 +41,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/malloc.h>

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/kern_exit.c	Tue May 21 20:38:48 2019	(r348064)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/capsicum.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>

Modified: head/sys/kern/subr_eventhandler.c
==============================================================================
--- head/sys/kern/subr_eventhandler.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/subr_eventhandler.c	Tue May 21 20:38:48 2019	(r348064)
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>

Modified: head/sys/kern/sys_process.c
==============================================================================
--- head/sys/kern/sys_process.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/sys_process.c	Tue May 21 20:38:48 2019	(r348064)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/syscallsubr.h>

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/vfs_bio.c	Tue May 21 20:38:48 2019	(r348064)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/devicestat.h>
 #include <sys/eventhandler.h>
 #include <sys/fail.h>
+#include <sys/ktr.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/vfs_cache.c	Tue May 21 20:38:48 2019	(r348064)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/filedesc.h>
 #include <sys/fnv_hash.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>

Modified: head/sys/kern/vfs_mount.c
==============================================================================
--- head/sys/kern/vfs_mount.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/vfs_mount.c	Tue May 21 20:38:48 2019	(r348064)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/libkern.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/vfs_subr.c	Tue May 21 20:38:48 2019	(r348064)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/ktr.h>
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>

Modified: head/sys/kern/vfs_vnops.c
==============================================================================
--- head/sys/kern/vfs_vnops.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/kern/vfs_vnops.c	Tue May 21 20:38:48 2019	(r348064)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/kdb.h>
+#include <sys/ktr.h>
 #include <sys/stat.h>
 #include <sys/priv.h>
 #include <sys/proc.h>

Modified: head/sys/mips/mips/freebsd32_machdep.c
==============================================================================
--- head/sys/mips/mips/freebsd32_machdep.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/mips/mips/freebsd32_machdep.c	Tue May 21 20:38:48 2019	(r348064)
@@ -41,6 +41,7 @@
 #include <sys/sysent.h>
 #include <sys/exec.h>
 #include <sys/imgact.h>
+#include <sys/ktr.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/namei.h>

Modified: head/sys/mips/mips/pm_machdep.c
==============================================================================
--- head/sys/mips/mips/pm_machdep.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/mips/mips/pm_machdep.c	Tue May 21 20:38:48 2019	(r348064)
@@ -40,13 +40,13 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysent.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/exec.h>
+#include <sys/ktr.h>
 #include <sys/imgact.h>
 #include <sys/ucontext.h>
 #include <sys/lock.h>

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/mips/mips/trap.c	Tue May 21 20:38:48 2019	(r348064)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysent.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/lock.h>

Modified: head/sys/riscv/riscv/trap.c
==============================================================================
--- head/sys/riscv/riscv/trap.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/riscv/riscv/trap.c	Tue May 21 20:38:48 2019	(r348064)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pioctl.h>

Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/ufs/ffs/ffs_vfsops.c	Tue May 21 20:38:48 2019	(r348064)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/bio.h>

Modified: head/sys/ufs/ufs/ufs_extattr.c
==============================================================================
--- head/sys/ufs/ufs/ufs_extattr.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/ufs/ufs/ufs_extattr.c	Tue May 21 20:38:48 2019	(r348064)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Tue May 21 19:42:04 2019	(r348063)
+++ head/sys/vm/vnode_pager.c	Tue May 21 20:38:48 2019	(r348064)
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vmmeter.h>
+#include <sys/ktr.h>
 #include <sys/limits.h>
 #include <sys/conf.h>
 #include <sys/rwlock.h>


More information about the svn-src-head mailing list