diff options
| author | ken <ken@FreeBSD.org> | 2002-07-12 02:23:55 +0000 |
|---|---|---|
| committer | ken <ken@FreeBSD.org> | 2002-07-12 02:23:55 +0000 |
| commit | b1a7b34086542203808b4180044672dc6b331109 (patch) | |
| tree | d709988f7d874eb9e6626f8ffbec7663c4f7da6d /sys/kern/kern_subr.c | |
| parent | 722bbd5d1c6e911bef0bac2cd8abaa376e981ad6 (diff) | |
| download | FreeBSD-src-b1a7b34086542203808b4180044672dc6b331109.zip FreeBSD-src-b1a7b34086542203808b4180044672dc6b331109.tar.gz | |
Fix compilation with ENABLE_VFS_IOOPT turned on and ZERO_COPY_SOCKETS
turned off.
Clean up #ifdefs, and remove a bunch of unnecessary includes.
Reviewed by: bde
Tested by: netchild
Diffstat (limited to 'sys/kern/kern_subr.c')
| -rw-r--r-- | sys/kern/kern_subr.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 1961839..93ef221 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -56,32 +56,27 @@ #include <vm/vm.h> #include <vm/vm_page.h> #include <vm/vm_map.h> +#ifdef ZERO_COPY_SOCKETS +#include <vm/vm_param.h> +#endif +#if defined(ZERO_COPY_SOCKETS) || defined(ENABLE_VFS_IOOPT) +#include <vm/vm_object.h> +#endif SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV, "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)"); -#ifdef ZERO_COPY_SOCKETS -#include <vm/vm.h> -#include <vm/vm_param.h> -#include <sys/lock.h> -#include <vm/pmap.h> -#include <vm/vm_map.h> -#include <vm/vm_page.h> -#include <vm/vm_object.h> -#include <vm/vm_pager.h> -#include <vm/vm_kern.h> -#include <vm/vm_extern.h> -#include <vm/swap_pager.h> -#include <sys/mbuf.h> -#include <machine/cpu.h> +#if defined(ZERO_COPY_SOCKETS) || defined(ENABLE_VFS_IOOPT) +static int userspaceco(caddr_t cp, u_int cnt, struct uio *uio, + struct vm_object *obj, int disposable); +#endif +#ifdef ZERO_COPY_SOCKETS /* Declared in uipc_socket.c */ extern int so_zero_copy_receive; static int vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr, vm_offset_t uaddr); -static int userspaceco(caddr_t cp, u_int cnt, struct uio *uio, - struct vm_object *obj, int disposable); static int vm_pgmoveco(mapa, srcobj, kaddr, uaddr) |
