mirror of
https://github.com/opnsense/src.git
synced 2026-06-09 08:43:19 -04:00
Remove vnode.h and adjust includes to compensate for pollution.
This commit is contained in:
parent
75a323c107
commit
8080d4d196
5 changed files with 13 additions and 6 deletions
|
|
@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
|
||||
|
|
@ -61,6 +60,9 @@ __FBSDID("$FreeBSD$");
|
|||
#include <machine/clock.h> /* for DELAY */
|
||||
#include <pci/pcivar.h>
|
||||
#else
|
||||
#include <sys/lock.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/selinfo.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
|
||||
|
|
@ -59,6 +58,9 @@ __FBSDID("$FreeBSD$");
|
|||
#include <machine/clock.h> /* for DELAY */
|
||||
#include <pci/pcivar.h>
|
||||
#else
|
||||
#include <sys/lock.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/selinfo.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -107,11 +107,13 @@ __FBSDID("$FreeBSD$");
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/signalvar.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/selinfo.h>
|
||||
#include <sys/uio.h>
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_kern.h>
|
||||
|
|
@ -1258,7 +1260,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *uio, int ioflag)
|
|||
LOCK_VBI(bktr);
|
||||
|
||||
while(bktr->vbisize == 0) {
|
||||
if (ioflag & IO_NDELAY) {
|
||||
if (ioflag & FNDELAY) {
|
||||
status = EWOULDBLOCK;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
|
|||
#else
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#include <sys/vnode.h>
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_kern.h>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/vnode.h>
|
||||
#ifdef __NetBSD__
|
||||
#include <sys/proc.h>
|
||||
#endif
|
||||
|
|
@ -56,6 +55,9 @@ __FBSDID("$FreeBSD$");
|
|||
#include <machine/clock.h> /* for DELAY */
|
||||
#include <pci/pcivar.h>
|
||||
#else
|
||||
#include <sys/lock.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/selinfo.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue