diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-08 23:31:22 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-08 23:31:22 +0000 |
| commit | 925bd4b59711ba48ad05241abb3ff5dd381f49e0 (patch) | |
| tree | ef3d727f38910348f7ca411ec6e2b965cac695b3 | |
| parent | Cannot find a reason for this to need machine/cpu.h (diff) | |
| download | wireguard-openbsd-925bd4b59711ba48ad05241abb3ff5dd381f49e0.tar.xz wireguard-openbsd-925bd4b59711ba48ad05241abb3ff5dd381f49e0.zip | |
sys/user.h can now be substantially gutted.
ok guenther
| -rw-r--r-- | bin/ps/ps.c | 3 | ||||
| -rw-r--r-- | lib/libkvm/kvm_proc2.c | 6 | ||||
| -rw-r--r-- | sys/sys/ktrace.h | 4 | ||||
| -rw-r--r-- | sys/sys/user.h | 12 |
4 files changed, 9 insertions, 16 deletions
diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 4456af835ce..6d76ee8340f 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.c,v 1.61 2014/06/05 07:29:20 guenther Exp $ */ +/* $OpenBSD: ps.c,v 1.62 2014/07/08 23:31:22 deraadt Exp $ */ /* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */ /*- @@ -32,7 +32,6 @@ #include <sys/param.h> #include <sys/sysctl.h> -#include <sys/user.h> #include <sys/time.h> #include <sys/resource.h> #include <sys/proc.h> diff --git a/lib/libkvm/kvm_proc2.c b/lib/libkvm/kvm_proc2.c index 2bc877e5198..04270782b93 100644 --- a/lib/libkvm/kvm_proc2.c +++ b/lib/libkvm/kvm_proc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_proc2.c,v 1.23 2014/07/04 05:58:31 guenther Exp $ */ +/* $OpenBSD: kvm_proc2.c,v 1.24 2014/07/08 23:31:22 deraadt Exp $ */ /* $NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -71,12 +71,14 @@ #define __need_process #include <sys/param.h> -#include <sys/user.h> #include <sys/proc.h> #include <sys/exec.h> #include <sys/stat.h> +#include <sys/ucred.h> #include <sys/ioctl.h> #include <sys/tty.h> +#include <sys/resource.h> +#include <sys/resourcevar.h> #include <sys/signalvar.h> #include <stddef.h> #include <stdlib.h> diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 2ea13cf514f..104a3f3f905 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ktrace.h,v 1.19 2014/03/26 05:23:42 guenther Exp $ */ +/* $OpenBSD: ktrace.h,v 1.20 2014/07/08 23:31:22 deraadt Exp $ */ /* $NetBSD: ktrace.h,v 1.12 1996/02/04 02:12:29 christos Exp $ */ /* @@ -32,6 +32,8 @@ * @(#)ktrace.h 8.1 (Berkeley) 6/2/93 */ +#include <sys/uio.h> + /* * operations to ktrace system call (KTROP(op)) */ diff --git a/sys/sys/user.h b/sys/sys/user.h index b057508e5bf..7ab72052ea3 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -1,4 +1,4 @@ -/* $OpenBSD: user.h,v 1.8 2012/03/23 15:51:26 guenther Exp $ */ +/* $OpenBSD: user.h,v 1.9 2014/07/08 23:31:22 deraadt Exp $ */ /* $NetBSD: user.h,v 1.10 1996/04/09 20:55:49 cgd Exp $ */ /* @@ -33,18 +33,8 @@ */ #include <machine/pcb.h> -#ifndef _KERNEL -/* stuff that *used* to be included by user.h, or is now needed */ -#include <errno.h> -#include <sys/time.h> #include <sys/resource.h> -#include <sys/ucred.h> -#include <sys/uio.h> -#endif #include <sys/resourcevar.h> -#include <uvm/uvm_extern.h> /* XXX */ -#include <sys/sysctl.h> - /* * Per process structure containing data that isn't needed in core |