diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-10-29 16:06:56 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-10-29 16:06:56 +0000 |
| commit | cf9fa8e72541441be08abdd3a8475449da7d7995 (patch) | |
| tree | 96a325b75cd2201d7fe7ff7173caccb9185d5376 | |
| parent | d74a913b68131656f4e2dbd1a87d52d31fcfaa47 (diff) | |
| download | src-cf9fa8e72541441be08abdd3a8475449da7d7995.tar.gz src-cf9fa8e72541441be08abdd3a8475449da7d7995.zip | |
Move suser() and suser_xxx() prototypes and a related #define from
<sys/proc.h> to <sys/systm.h>.
Correctly document the #includes needed in the manpage.
Add one now needed #include of <sys/systm.h>.
Remove the consequent 48 unused #includes of <sys/proc.h>.
Notes
Notes:
svn path=/head/; revision=67893
63 files changed, 16 insertions, 66 deletions
diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9 index ec63456d2a62..067707389542 100644 --- a/share/man/man9/suser.9 +++ b/share/man/man9/suser.9 @@ -42,8 +42,7 @@ .Nd check if process has superuser privelige .Sh SYNOPSIS .Fd #include <sys/param.h> -.Fd #include <sys/proc.h> -.Fd #include <sys/ucred.h> +.Fd #include <sys/systm.h> .Ft int .Fn suser "struct proc *proc" .Ft int diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c index e557d1f41c5e..6eadbf8fbbcc 100644 --- a/sys/dev/an/if_an.c +++ b/sys/dev/an/if_an.c @@ -95,7 +95,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/ucred.h> #include <sys/socket.h> #ifdef ANCACHE diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index 30dcfca51969..bfcabb2ed1c2 100644 --- a/sys/dev/asr/asr.c +++ b/sys/dev/asr/asr.c @@ -181,7 +181,6 @@ static dpt_sig_S ASR_sig = { #include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/disklabel.h> #include <sys/bus.h> diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 052ab3550efc..c3509cf486ef 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/bio.h> #include <sys/bus.h> diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c index ef105ba70143..023796b5949f 100644 --- a/sys/dev/awi/awi.c +++ b/sys/dev/awi/awi.c @@ -100,7 +100,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/errno.h> diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c index 308cfcb8a932..a8f76ec793e0 100644 --- a/sys/dev/awi/awi_wep.c +++ b/sys/dev/awi/awi_wep.c @@ -55,7 +55,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/socket.h> #include <sys/errno.h> #include <sys/sockio.h> diff --git a/sys/dev/awi/awi_wicfg.c b/sys/dev/awi/awi_wicfg.c index 76ff3efb44a6..80882ba3035a 100644 --- a/sys/dev/awi/awi_wicfg.c +++ b/sys/dev/awi/awi_wicfg.c @@ -46,7 +46,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/socket.h> #include <sys/errno.h> #include <sys/sockio.h> diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index a3997f9981d9..40068071d6d6 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -70,7 +70,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index a3997f9981d9..40068071d6d6 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -70,7 +70,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index 3fa1aafc0bbb..c62de457c146 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c index b74b8043776a..6dd9f68447af 100644 --- a/sys/dev/dgb/dgm.c +++ b/sys/dev/dgb/dgm.c @@ -49,7 +49,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 2f3e4a3f0e14..13230db56885 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -37,7 +37,6 @@ #include <sys/module.h> #include <sys/bus.h> #include <sys/poll.h> -#include <sys/proc.h> #include <sys/select.h> #include <sys/random.h> #include <sys/vnode.h> diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 11da8ac39bd9..2b55c523e6bc 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -42,7 +42,6 @@ #include <sys/ipl.h> #include <sys/kernel.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 7014a5ebe6ee..a12110eb1a2d 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -41,7 +41,6 @@ #include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/dkstat.h> #include <sys/conf.h> #include <sys/kernel.h> diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index d102430eea9d..28e6a4253f73 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -48,7 +48,6 @@ static const char si_copyright1[] = "@(#) Copyright (C) Specialix International #include <sys/ioctl_compat.h> #endif #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/dkstat.h> diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 5c89ba2554e8..648a6a5282ca 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -23,7 +23,6 @@ #if defined(COMPAT_43) || defined(COMPAT_SUNOS) #include <sys/ioctl_compat.h> #endif -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/tty.h> #include <sys/conf.h> diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 49a1248ac89a..34f914b77dcb 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/proc.h> #include <sys/tty.h> #include <sys/kernel.h> #include <sys/consio.h> diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 9d584d96082e..f559faa662eb 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -61,7 +61,6 @@ #include <machine/cpu.h> #endif #endif -#include <sys/proc.h> #include <sys/queue.h> #include <machine/bus.h> diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 63b456c3a78c..bbc74c0ddac9 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -73,7 +73,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/ucred.h> #include <sys/socket.h> #include <sys/module.h> diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 66e8422f909f..e1aec042e3cd 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -199,7 +199,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> -#include <sys/proc.h> #include <sys/bus.h> #include <sys/sysctl.h> diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index e3c717e4a418..fd74abd772c6 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -42,7 +42,6 @@ #include <sys/conf.h> #include <sys/vnode.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/mount.h> #include <sys/namei.h> #include <sys/dirent.h> diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index f060e5b177fe..839f752c498b 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -32,7 +32,6 @@ #include <sys/types.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/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c index ebf9ce44d576..6457897c46a7 100644 --- a/sys/fs/umapfs/umap_vfsops.c +++ b/sys/fs/umapfs/umap_vfsops.c @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/vnode.h> #include <sys/mount.h> #include <sys/namei.h> diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index d7b95f38f8d4..f27dd2818291 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -40,7 +40,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/fcntl.h> #include <sys/stat.h> #include <sys/kernel.h> diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 3fa1aafc0bbb..c62de457c146 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c index b74b8043776a..6dd9f68447af 100644 --- a/sys/gnu/i386/isa/dgm.c +++ b/sys/gnu/i386/isa/dgm.c @@ -49,7 +49,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 3bca982abb51..094dc6fe2674 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -27,7 +27,6 @@ #include <sys/kernel.h> #include <sys/fcntl.h> #include <sys/conf.h> -#include <sys/proc.h> #include <sys/tty.h> #include <sys/socket.h> #include <net/if.h> diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index a3997f9981d9..40068071d6d6 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -70,7 +70,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c index 63b456c3a78c..bbc74c0ddac9 100644 --- a/sys/i386/isa/if_wi.c +++ b/sys/i386/isa/if_wi.c @@ -73,7 +73,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/ucred.h> #include <sys/socket.h> #include <sys/module.h> diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c index 66e8422f909f..e1aec042e3cd 100644 --- a/sys/i386/isa/if_wl.c +++ b/sys/i386/isa/if_wl.c @@ -199,7 +199,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/syslog.h> -#include <sys/proc.h> #include <sys/bus.h> #include <sys/sysctl.h> diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index d8e9d6812787..a9341fff3c68 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -47,7 +47,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/uio.h> diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 11da8ac39bd9..2b55c523e6bc 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -42,7 +42,6 @@ #include <sys/ipl.h> #include <sys/kernel.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/fcntl.h> diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 82d9a1ff9c98..8162a45094e1 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -47,7 +47,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/tty.h> -#include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/bus.h> diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index d219ae303c25..eddd9ed8fee2 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -34,6 +34,7 @@ #include "opt_sysvipc.h" #include <sys/param.h> +#include <sys/systm.h> #include <sys/ipc.h> #include <sys/proc.h> #include <sys/ucred.h> diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index f4e2bd45d467..2931dc502bf1 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -46,7 +46,6 @@ #include <sys/kernel.h> #include <sys/reboot.h> #include <sys/sysctl.h> -#include <sys/proc.h> #include <sys/tty.h> #include <sys/uio.h> diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index 5c89ba2554e8..648a6a5282ca 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -23,7 +23,6 @@ #if defined(COMPAT_43) || defined(COMPAT_SUNOS) #include <sys/ioctl_compat.h> #endif -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/tty.h> #include <sys/conf.h> diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index ebf9ce44d576..6457897c46a7 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/vnode.h> #include <sys/mount.h> #include <sys/namei.h> diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index d7b95f38f8d4..f27dd2818291 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -40,7 +40,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/fcntl.h> #include <sys/stat.h> #include <sys/kernel.h> diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index aabe8c3550ce..45483bbe827f 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -70,7 +70,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/dkstat.h> diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index 07b316d18041..102ae69d5c15 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -37,7 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 9f54cb7e62fd..bdaeb6c5e574 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -1,11 +1,12 @@ /* * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. + * + * $FreeBSD$ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/sockio.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index 9fa97893853e..167c0b36aefb 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -1,11 +1,12 @@ /* * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. + * + * $FreeBSD$ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index 9fa97893853e..167c0b36aefb 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -1,11 +1,12 @@ /* * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. + * + * $FreeBSD$ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c index fb27fc42cdee..41c2fd96b664 100644 --- a/sys/netatm/atm_usrreq.c +++ b/sys/netatm/atm_usrreq.c @@ -36,7 +36,6 @@ */ #include <sys/param.h> -#include <sys/proc.h> #include <sys/sockio.h> #include <sys/protosw.h> #include <sys/socket.h> diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index a0c109ad97b0..a917bcb084da 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -50,7 +50,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/domain.h> #include <sys/errno.h> #include <sys/kernel.h> diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c index 313ad7b36b59..e217f3a645b1 100644 --- a/sys/netgraph/ng_tty.c +++ b/sys/netgraph/ng_tty.c @@ -62,7 +62,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> -#include <sys/proc.h> #include <sys/mbuf.h> #include <sys/malloc.h> #include <sys/fcntl.h> diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 79e5721af1bb..7dcfe8775106 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -38,7 +38,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/socket.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index b2f92b823cdf..04e931a78dfc 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -51,7 +51,6 @@ #include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/proc.h> #include <vm/vm_zone.h> diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index ed3d873d850b..2e7976ba62d8 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -51,7 +51,6 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/proc.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 554478231997..e15ee4e67a6b 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -42,7 +42,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 40b0df4fb5b1..2c0bc74be264 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -76,7 +76,6 @@ #include <sys/socketvar.h> #include <sys/errno.h> #include <sys/time.h> -#include <sys/proc.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 7e83bf5ed86a..6ded43098824 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -82,7 +82,6 @@ #include <sys/time.h> #include <sys/kernel.h> #include <sys/syslog.h> -#include <sys/proc.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 328e7ea8c338..f990d449d81f 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -80,7 +80,6 @@ #include <sys/socketvar.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c index c6d831f38f92..ee050190c2f7 100644 --- a/sys/netinet6/udp6_output.c +++ b/sys/netinet6/udp6_output.c @@ -77,7 +77,6 @@ #include <sys/errno.h> #include <sys/stat.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/syslog.h> #include <net/if.h> diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c index 5035256f5618..7ba85ae4303c 100644 --- a/sys/netipx/ipx.c +++ b/sys/netipx/ipx.c @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/sockio.h> -#include <sys/proc.h> #include <sys/socket.h> #include <net/if.h> diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 034751b949d3..61af5c32ef7e 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/proc.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index e67426291074..22b2e2f99a22 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -42,7 +42,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/mbuf.h> -#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c index f060e5b177fe..839f752c498b 100644 --- a/sys/ntfs/ntfs_subr.c +++ b/sys/ntfs/ntfs_subr.c @@ -32,7 +32,6 @@ #include <sys/types.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/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index 722dc507678c..14b7f6c937ad 100644 --- a/sys/pc98/pc98/wd_cd.c +++ b/sys/pc98/pc98/wd_cd.c @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/bio.h> #include <sys/disklabel.h> diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index f3d20dc279de..55a1d3b51876 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/select.h> #include <sys/sysctl.h> diff --git a/sys/sys/proc.h b/sys/sys/proc.h index b2cffb625b0e..af24b303c07a 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -394,8 +394,6 @@ MALLOC_DECLARE(M_ZOMBIE); MALLOC_DECLARE(M_PARGS); #endif -/* flags for suser_xxx() */ -#define PRISON_ROOT 1 /* Handy macro to determine of p1 can mangle p2 */ @@ -501,9 +499,6 @@ void schedclock __P((struct proc *)); void setrunnable __P((struct proc *)); void setrunqueue __P((struct proc *)); void sleepinit __P((void)); -int suser __P((const struct proc *)); -int suser_xxx __P((const struct ucred *cred, const struct proc *proc, - int flag)); void remrunqueue __P((struct proc *)); void cpu_switch __P((void)); void cpu_throw __P((void)) __dead2; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index ae0dea9bdf3d..45fae6298349 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -96,6 +96,7 @@ struct mtx; struct proc; struct timeval; struct tty; +struct ucred; struct uio; void Debugger __P((const char *msg)); @@ -166,6 +167,13 @@ void startprofclock __P((struct proc *)); void stopprofclock __P((struct proc *)); void setstatclockrate __P((int hzrate)); +/* flags for suser_xxx() */ +#define PRISON_ROOT 1 + +int suser __P((const struct proc *)); +int suser_xxx __P((const struct ucred *cred, const struct proc *proc, + int flag)); + char *getenv __P((char *name)); int getenv_int __P((char *name, int *data)); quad_t getenv_quad __P((char *name, quad_t *data)); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 7201d4933a7a..00977f923913 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -50,7 +50,6 @@ #include <sys/stat.h> #include <sys/bio.h> #include <sys/buf.h> -#include <sys/proc.h> #include <sys/mount.h> #include <sys/unistd.h> #include <sys/vnode.h> |