From f82e4ca62c2bea6ce2d8c4f72263cb29a85f00b3 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 29 Oct 2000 14:54:55 +0000
Subject: Weaken a bogus dependency on <sys/proc.h> in <sys/buf.h> by
 #ifdef'ing the offending inline function (BUF_KERNPROC) on it being #included
 already.

I'm not sure BUF_KERNPROC() is even the right thing to do or in the
right place or implemented the right way (inline vs normal function).

Remove consequently unneeded #includes of <sys/proc.h>
---
 sys/dev/usb/ohci_pci.c                | 1 -
 sys/dev/usb/uhci.c                    | 1 -
 sys/dev/usb/uhci_pci.c                | 1 -
 sys/dev/usb/usbdi.c                   | 1 -
 sys/dev/wds/wd7000.c                  | 1 -
 sys/fs/cd9660/cd9660_node.c           | 1 -
 sys/fs/msdosfs/msdosfs_denode.c       | 1 -
 sys/fs/nwfs/nwfs_vnops.c              | 1 -
 sys/gnu/ext2fs/ext2_linux_balloc.c    | 1 -
 sys/gnu/ext2fs/ext2_linux_ialloc.c    | 1 -
 sys/gnu/fs/ext2fs/ext2_linux_balloc.c | 1 -
 sys/gnu/fs/ext2fs/ext2_linux_ialloc.c | 1 -
 sys/isofs/cd9660/cd9660_node.c        | 1 -
 sys/msdosfs/msdosfs_denode.c          | 1 -
 sys/nwfs/nwfs_vnops.c                 | 1 -
 sys/pci/ohci_pci.c                    | 1 -
 sys/pci/uhci_pci.c                    | 1 -
 sys/sys/buf.h                         | 2 ++
 sys/ufs/ifs/ifs_lookup.c              | 1 -
 sys/ufs/ifs/ifs_subr.c                | 1 -
 sys/ufs/ifs/ifs_vfsops.c              | 1 -
 sys/vm/vm_pager.c                     | 1 -
 22 files changed, 2 insertions(+), 21 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index e1076f8..9806063 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -56,7 +56,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/proc.h>
 #include <sys/queue.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index d9aeabf..99c85c4 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -63,7 +63,6 @@
 #include <machine/cpu.h>
 #endif
 #endif
-#include <sys/proc.h>
 #include <sys/queue.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 154badf..003a415 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -54,7 +54,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/proc.h>
 #include <sys/queue.h>
 #if defined(__FreeBSD__)
 #include <sys/bus.h>
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index f4ac846..7dc8a0e 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -51,7 +51,6 @@
 #endif
 #endif
 #include <sys/malloc.h>
-#include <sys/proc.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index c09532a..537642e 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -133,7 +133,6 @@
 
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/disklabel.h>
 
 #include <cam/cam.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 500a1a6..5074679 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
-#include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 37fe667..6aea47a 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -53,7 +53,6 @@
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index e7c7fa6..59694f9 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c
index 2651d88..817408c 100644
--- a/sys/gnu/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_balloc.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/gnu/ext2fs/ext2_linux_ialloc.c b/sys/gnu/ext2fs/ext2_linux_ialloc.c
index da03c51..3ba49b0 100644
--- a/sys/gnu/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_ialloc.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index 2651d88..817408c 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
index da03c51..3ba49b0 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 500a1a6..5074679 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
-#include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 37fe667..6aea47a 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -53,7 +53,6 @@
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
diff --git a/sys/nwfs/nwfs_vnops.c b/sys/nwfs/nwfs_vnops.c
index e7c7fa6..59694f9 100644
--- a/sys/nwfs/nwfs_vnops.c
+++ b/sys/nwfs/nwfs_vnops.c
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/mount.h>
 #include <sys/unistd.h>
diff --git a/sys/pci/ohci_pci.c b/sys/pci/ohci_pci.c
index e1076f8..9806063 100644
--- a/sys/pci/ohci_pci.c
+++ b/sys/pci/ohci_pci.c
@@ -56,7 +56,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/proc.h>
 #include <sys/queue.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c
index 154badf..003a415 100644
--- a/sys/pci/uhci_pci.c
+++ b/sys/pci/uhci_pci.c
@@ -54,7 +54,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/proc.h>
 #include <sys/queue.h>
 #if defined(__FreeBSD__)
 #include <sys/bus.h>
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index c8d4788..d085de6 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -304,6 +304,7 @@ do {						\
 	lockdestroy(&(bp)->b_lock);		\
 } while (0)
 
+#ifdef _SYS_PROC_H_	/* Avoid #include <sys/proc.h> pollution */
 /*
  * When initiating asynchronous I/O, change ownership of the lock to the
  * kernel. Once done, the lock may legally released by biodone. The
@@ -320,6 +321,7 @@ BUF_KERNPROC(struct buf *bp)
 		p->p_locks--;
 	bp->b_lock.lk_lockholder = LK_KERNPROC;
 }
+#endif
 /*
  * Find out the number of references to a lock.
  */
diff --git a/sys/ufs/ifs/ifs_lookup.c b/sys/ufs/ifs/ifs_lookup.c
index 47c7f11..7f65967 100644
--- a/sys/ufs/ifs/ifs_lookup.c
+++ b/sys/ufs/ifs/ifs_lookup.c
@@ -42,7 +42,6 @@
 #include <sys/namei.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
diff --git a/sys/ufs/ifs/ifs_subr.c b/sys/ufs/ifs/ifs_subr.c
index b1c213b..dfd5cff 100644
--- a/sys/ufs/ifs/ifs_subr.c
+++ b/sys/ufs/ifs/ifs_subr.c
@@ -42,7 +42,6 @@
 #include <sys/stat.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>
diff --git a/sys/ufs/ifs/ifs_vfsops.c b/sys/ufs/ifs/ifs_vfsops.c
index e607d54..ec1abd9 100644
--- a/sys/ufs/ifs/ifs_vfsops.c
+++ b/sys/ufs/ifs/ifs_vfsops.c
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index a251b97..6dbcca2 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -77,7 +77,6 @@
 #include <sys/buf.h>
 #include <sys/ucred.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-- 
cgit v1.1