d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo #undef KERNEL hack for vnode.h to avoid vnode_if.h.

Browse Source 
XXX It probably makes sense to have a flag for bsd.kern.mk to avoid these
    rules.
XXX IO_NDELAY seems to be the main reason for it, when used in a cdevsw
    read or write "flag" context.  Perhaps a redundant declaration
    somewhere like sys/conf.h might help remove the need for vnode.h in
    these device drivers in the first place.
This commit is contained in:
peter 1999-01-17 20:53:48 +00:00
parent cb99881fc9
commit a33b0a11f4
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/modules/if_ppp/Makefile
View File

@ -1,10 +1,11 @@
# $Id: Makefile,v 1.14 1998/03/27 04:05:08 peter Exp $
# $Id: Makefile,v 1.15 1998/10/16 04:30:44 peter Exp $
.PATH: ${.CURDIR}/../../net
KMOD= if_ppp
SRCS= if_ppp.c ppp_tty.c slcompress.c \
bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h
bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.c vnode_if.h
NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1

5
sys/modules/if_tun/Makefile
View File

@ -1,9 +1,10 @@
# $Id: Makefile,v 1.6 1998/02/01 18:12:14 bde Exp $
# $Id: Makefile,v 1.7 1998/10/16 04:30:45 peter Exp $
.PATH: ${.CURDIR}/../../net
KMOD= if_tun
SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h
SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.h vnode_if.c
NBPFILTER?= 0
NTUN?= 2

6
sys/net/if_tun.c
View File

@ -38,13 +38,7 @@
#endif /*DEVFS*/
#include <sys/conf.h>
#include <sys/uio.h>
/*
* XXX stop <sys/vnode.h> from including <vnode_if.h>. <vnode_if.h> doesn't
* exist if we are an LKM.
*/
#undef KERNEL
#include <sys/vnode.h>
#define KERNEL
#include <net/if.h>
#include <net/netisr.h>

11
sys/net/ppp_tty.c
View File

@ -70,7 +70,7 @@
* Paul Mackerras (paulus@cs.anu.edu.au).
*/
/* $Id: ppp_tty.c,v 1.36 1998/06/07 17:12:07 dfr Exp $ */
/* $Id: ppp_tty.c,v 1.37 1998/06/20 16:39:35 peter Exp $ */
#include "ppp.h"
#if NPPP > 0
@ -89,14 +89,7 @@
#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/uio.h>
/*
* XXX stop <sys/vnode.h> from including <vnode_if.h>. <vnode_if.h> doesn't
* exist if we are an LKM.
*/
#undef KERNEL
# include <sys/vnode.h>
#define KERNEL
#include <sys/vnode.h>
#ifdef __i386__
#include <i386/isa/intr_machdep.h>