1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-22 15:47:37 +00:00

Replaced #includes of <sys/user.h> by less gross headers, usually

<sys/vm.h>.  Many device drivers need only the definition of vtophys()
from vm.

Added nearby #includes of <sys/conf.h> where appropriate.
This commit is contained in:
Bruce Evans 1995-12-06 23:52:35 +00:00
parent 86a1c05db0
commit 0310c19f5d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=12659
21 changed files with 66 additions and 40 deletions

View File

@ -1,5 +1,5 @@
/*-
* dgb.c $Id: dgb.c,v 1.6 1995/11/29 10:47:03 julian Exp $
* dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $
*
* Digiboard driver.
*
@ -32,7 +32,6 @@
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/file.h>
@ -44,6 +43,8 @@
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>

View File

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.19 1995/11/29 14:39:55 julian Exp $
* $Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $
*/
#ifndef lint
@ -45,7 +45,6 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992",
#include <sys/tty.h>
#include <sys/ttydefaults.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
@ -57,6 +56,8 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992",
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>

View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $
* $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $
*/
#include "sc.h"
@ -36,7 +36,7 @@
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/callout.h>
@ -55,6 +55,8 @@
#include <machine/apm_bios.h>
#include <machine/random.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>

View File

@ -1,5 +1,5 @@
/*-
* dgb.c $Id: dgb.c,v 1.6 1995/11/29 10:47:03 julian Exp $
* dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $
*
* Digiboard driver.
*
@ -32,7 +32,6 @@
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/file.h>
@ -44,6 +43,8 @@
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>

View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.40 1995/11/09 22:43:24 gibbs Exp $
* $Id: aha1742.c,v 1.41 1995/11/29 10:12:28 phk Exp $
*/
#include <sys/types.h>
@ -28,8 +28,11 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/eisa/eisaconf.h>
#else
#define NAHB 1

View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.49 1995/10/28 15:38:40 phk Exp $
* $Id: aha1542.c,v 1.50 1995/11/04 17:07:00 bde Exp $
*/
/*
@ -30,11 +30,13 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#include <machine/clock.h>
#include <machine/cpu.h> /* XXX for bootverbose: a funny place */
#include <vm/vm.h>
#include <i386/isa/isa_device.h>
#endif /* KERNEL */
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>

View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.42 1995/10/28 15:38:47 phk Exp $
* $Id: bt742a.c,v 1.43 1995/11/04 17:07:08 bde Exp $
*/
/*
@ -45,11 +45,12 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#endif /* KERNEL */
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/isa_device.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>

View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.42 1995/11/29 14:39:44 julian Exp $
* $Id: lpt.c,v 1.43 1995/12/02 20:33:40 phk Exp $
*/
/*
@ -107,7 +107,6 @@
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
@ -118,6 +117,8 @@
#include <machine/clock.h>
#include <machine/lpt.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/lptreg.h>

View File

@ -72,7 +72,7 @@
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/callout.h>
@ -90,7 +90,7 @@
#include "conf.h"
#include "ioctl.h"
#include "proc.h"
#include "user.h"
#include "signalvar.h"
#include "tty.h"
#include "uio.h"
#include "callout.h"
@ -169,10 +169,8 @@
#include <machine/clock.h>
#include <machine/md_var.h>
#endif
#include <vm/vm_kern.h>
#else /* PCVT_FREEBSD >= 200 */
#include "machine/pc/display.h"
#include "vm/vm_kern.h"
#endif /* PCVT_FREEBSD >= 200 */
#if PCVT_FREEBSD > 205

View File

@ -65,6 +65,7 @@
#define PCVT_INCLUDE_VT_SELATTR /* get inline function from pcvt_hdr.h */
#include "pcvt_hdr.h" /* global include */
#include <vm/vm.h>
extern u_short csd_ascii[]; /* pcvt_tbl.h */
extern u_short csd_supplemental[];

View File

@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
* $Id: seagate.c,v 1.11 1995/09/19 18:55:17 bde Exp $
* $Id: seagate.c,v 1.12 1995/11/04 17:07:44 bde Exp $
*/
/*
@ -121,11 +121,12 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/devconf.h>
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/isa_device.h>
#include <scsi/scsi_all.h>

View File

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.19 1995/11/29 14:39:55 julian Exp $
* $Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $
*/
#ifndef lint
@ -45,7 +45,6 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992",
#include <sys/tty.h>
#include <sys/ttydefaults.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
@ -57,6 +56,8 @@ static char si_copyright1[] = "@(#) (C) Specialix International, 1990,1992",
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>

View File

@ -22,7 +22,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>

View File

@ -26,10 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: soundcard.c,v 1.34 1995/11/29 14:40:28 julian Exp $
* $Id: soundcard.c,v 1.35 1995/12/01 01:38:49 julian Exp $
*/
#include "sound_config.h"
#include <vm/vm.h>
#ifdef CONFIGURE_SOUNDCARD

View File

@ -54,9 +54,10 @@ error "Can only have 1 spigot configured."
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/malloc.h>
@ -64,6 +65,7 @@ error "Can only have 1 spigot configured."
#include <sys/errno.h>
#include <sys/mman.h>
#include <machine/frame.h>
#include <machine/spigot.h>
#include <machine/psl.h>

View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $
* $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $
*/
#include "sc.h"
@ -36,7 +36,7 @@
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/callout.h>
@ -55,6 +55,8 @@
#include <machine/apm_bios.h>
#include <machine/random.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>

View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.38 1995/11/04 17:07:54 bde Exp $
* $Id: ultra14f.c,v 1.39 1995/11/14 09:53:17 phk Exp $
*/
#include <sys/types.h>
@ -37,11 +37,12 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/devconf.h>
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/isa/isa_device.h>
#endif /*KERNEL */
#include <scsi/scsi_all.h>

View File

@ -57,7 +57,6 @@
#include <sys/ioctl.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/dkbad.h>
#include <sys/disklabel.h>
@ -68,6 +67,8 @@
#include <machine/clock.h>
#include <machine/cpu.h>
#include <vm/vm.h>
#include <i386/isa/isa_device.h>
static struct kern_devconf kdc_wds[NWDS] = { {

View File

@ -24,7 +24,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aic7xxx.c,v 1.46 1995/11/07 05:32:47 gibbs Exp $
* $Id: aic7xxx.c,v 1.47 1995/11/07 07:01:05 gibbs Exp $
*/
/*
* TODO:
@ -38,12 +38,17 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <machine/clock.h>
#include <vm/vm.h>
#include <i386/scsi/aic7xxx.h>
#include <i386/scsi/93cx6.h>
#include <dev/aic7xxx/aic7xxx_reg.h>
#define PAGESIZ 4096

View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $
* $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $
*/
#include "sc.h"
@ -36,7 +36,7 @@
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/callout.h>
@ -55,6 +55,8 @@
#include <machine/apm_bios.h>
#include <machine/random.h>
#include <vm/vm.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>

View File

@ -37,7 +37,7 @@
*
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
*
* $Id: bpf.c,v 1.16 1995/11/29 14:40:45 julian Exp $
* $Id: bpf.c,v 1.17 1995/12/02 19:37:19 bde Exp $
*/
#include "bpfilter.h"
@ -58,7 +58,7 @@
#include <sys/buf.h>
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/signalvar.h>
#include <sys/ioctl.h>
#include <sys/file.h>