make kernel includes standard

author Keith Bostic <bostic@ucbvax.Berkeley.EDU>

Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)

committer Keith Bostic <bostic@ucbvax.Berkeley.EDU>

Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)
author Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)
committer Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)
diff --git a/usr/src/sys/conf/nfsswapvmunix.c b/usr/src/sys/conf/nfsswapvmunix.c

index eab470f..58e6ebb 100644 (file)
--- a/usr/src/sys/conf/nfsswapvmunix.c
+++ b/usr/src/sys/conf/nfsswapvmunix.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)nfsswapvmunix.c     7.1 (Berkeley) %G%
+ *     @(#)nfsswapvmunix.c     7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -16,13 +16,14 @@
   * See /sys/nfs/nfsdiskless.h for details of the fields.
   */
  
   * See /sys/nfs/nfsdiskless.h for details of the fields.
   */
  
-#include "../sys/param.h"
-#include "../sys/conf.h"
-#include "../sys/socket.h"
-#include "../sys/mount.h"
-#include "../net/if.h"
-#include "../nfs/nfsv2.h"
-#include "../nfs/nfsdiskless.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/socket.h>
+#include <sys/mount.h>
+
+#include <net/if.h>
+#include <nfs/nfsv2.h>
+#include <nfs/nfsdiskless.h>
  
  extern int nfs_mountroot();
  int (*mountroot)() = nfs_mountroot;
  
  extern int nfs_mountroot();
  int (*mountroot)() = nfs_mountroot;
diff --git a/usr/src/sys/conf/param.c b/usr/src/sys/conf/param.c

index f8670ee..0eb9bd5 100644 (file)
--- a/usr/src/sys/conf/param.c
+++ b/usr/src/sys/conf/param.c
@@ -4,23 +4,25 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)param.c     7.22 (Berkeley) %G%
+ *     @(#)param.c     7.23 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/socket.h"
-#include "sys/proc.h"
-#include "sys/vnode.h"
-#include "sys/file.h"
-#include "sys/callout.h"
-#include "sys/clist.h"
-#include "sys/mbuf.h"
-#include "ufs/ufs/quota.h"
-#include "sys/kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/socket.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
+#include <sys/callout.h>
+#include <sys/clist.h>
+#include <sys/mbuf.h>
+#include <sys/kernel.h>
+
+#include <ufs/ufs/quota.h>
+
  #ifdef SYSVSHM
  #ifdef SYSVSHM
-#include "machine/vmparam.h"
-#include "sys/shm.h"
+#include <machine/vmparam.h>
+#include <sys/shm.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/dev/cd.c b/usr/src/sys/dev/cd.c

index bac6d9e..e015948 100644 (file)
--- a/usr/src/sys/dev/cd.c
+++ b/usr/src/sys/dev/cd.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: cd.c 1.6 90/11/28$
   *
   *
   * from: Utah $Hdr: cd.c 1.6 90/11/28$
   *
- *     @(#)cd.c        7.4 (Berkeley) %G%
+ *     @(#)cd.c        7.5 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,15 +20,15 @@
  #include "cd.h"
  #if NCD > 0
  
  #include "cd.h"
  #if NCD > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/errno.h"
-#include "sys/dkstat.h"
-#include "sys/buf.h"
-#include "sys/malloc.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/dkstat.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/conf.h>
  
  
-#include "cdvar.h"
+#include <dev/cdvar.h>
  
  #ifdef DEBUG
  int cddebug = 0x00;
  
  #ifdef DEBUG
  int cddebug = 0x00;
diff --git a/usr/src/sys/dev/vn.c b/usr/src/sys/dev/vn.c

index 55b53f7..b1f1655 100644 (file)
--- a/usr/src/sys/dev/vn.c
+++ b/usr/src/sys/dev/vn.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: fd.c 1.3 89/12/03$
   *
   *
   * from: Utah $Hdr: fd.c 1.3 89/12/03$
   *
- *     @(#)vn.c        7.13 (Berkeley) %G%
+ *     @(#)vn.c        7.14 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -49,7 +49,7 @@
  
  #include <miscfs/specfs/specdev.h>
  
  
  #include <miscfs/specfs/specdev.h>
  
-#include "vnioctl.h"
+#include <dev/vnioctl.h>
  
  #ifdef DEBUG
  int vndebug = 0x00;
  
  #ifdef DEBUG
  int vndebug = 0x00;
diff --git a/usr/src/sys/hp/dev/cons.c b/usr/src/sys/hp/dev/cons.c

index edfb403..2e0f959 100644 (file)
--- a/usr/src/sys/hp/dev/cons.c
+++ b/usr/src/sys/hp/dev/cons.c
@@ -11,19 +11,19 @@
   *
   * from: Utah $Hdr: cons.c 1.7 92/01/21$
   *
   *
   * from: Utah $Hdr: cons.c 1.7 92/01/21$
   *
- *     @(#)cons.c      7.7 (Berkeley) %G%
+ *     @(#)cons.c      7.8 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/proc.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/file.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
  
  
-#include "cons.h"
+#include <hp/dev/cons.h>
  
  struct tty *constty;           /* virtual console output device */
  struct consdev *cn_tab;        /* physical console device info */
  
  struct tty *constty;           /* virtual console output device */
  struct consdev *cn_tab;        /* physical console device info */
diff --git a/usr/src/sys/hp/dev/dca.c b/usr/src/sys/hp/dev/dca.c

index e7b6227..f4500ab 100644 (file)
--- a/usr/src/sys/hp/dev/dca.c
+++ b/usr/src/sys/hp/dev/dca.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dca.c       7.16 (Berkeley) %G%
+ *     @(#)dca.c       7.17 (Berkeley) %G%
   */
  
  #include "dca.h"
   */
  
  #include "dca.h"
@@ -19,26 +19,26 @@
   *  The third bit of the Modem Control Register (MCR_IEN == 0x08) must be
   *  set to enable interrupts.
   */
   *  The third bit of the Modem Control Register (MCR_IEN == 0x08) must be
   *  set to enable interrupts.
   */
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/proc.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
-#include "sys/file.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/syslog.h"
-
-#include "hp/dev/device.h"
-#include "dcareg.h"
-
-#include "machine/cpu.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <hp/dev/device.h>
+#include <hp/dev/dcareg.h>
+
+#include <machine/cpu.h>
  #ifdef hp300
  #ifdef hp300
-#include "../../hp300/hp300/isr.h"
+#include <hp300/hp300/isr.h>
  #endif
  #ifdef hp700
  #endif
  #ifdef hp700
-#include "machine/asp.h"
+#include <machine/asp.h>
  #endif
  
  int    dcaprobe();
  #endif
  
  int    dcaprobe();
@@ -87,7 +87,7 @@ struct speedtab dcaspeedtab[] = {
  };
  
  #ifdef KGDB
  };
  
  #ifdef KGDB
-#include "machine/remote-sl.h"
+#include <machine/remote-sl.h>
  
  extern dev_t kgdb_dev;
  extern int kgdb_rate;
  
  extern dev_t kgdb_dev;
  extern int kgdb_rate;
@@ -645,7 +645,7 @@ dcamctl(dev, bits, how)
  /*
   * Following are all routines needed for DCA to act as console
   */
  /*
   * Following are all routines needed for DCA to act as console
   */
-#include "hp/dev/cons.h"
+#include <hp/dev/cons.h>
  
  dcacnprobe(cp)
         struct consdev *cp;
  
  dcacnprobe(cp)
         struct consdev *cp;
diff --git a/usr/src/sys/hp/dev/dcareg.h b/usr/src/sys/hp/dev/dcareg.h

index 66b1d18..1ff236c 100644 (file)
--- a/usr/src/sys/hp/dev/dcareg.h
+++ b/usr/src/sys/hp/dev/dcareg.h
@@ -4,14 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dcareg.h    7.4 (Berkeley) %G%
+ *     @(#)dcareg.h    7.5 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
-#include <hp/dev/iotypes.h>    /* XXX */
-#endif
+#include <hp/dev/iotypes.h>                    /* XXX */
  
  #ifdef hp700
  struct dcadevice {
  
  #ifdef hp700
  struct dcadevice {
diff --git a/usr/src/sys/hp/dev/grf.c b/usr/src/sys/hp/dev/grf.c

index 970d98f..08131eb 100644 (file)
--- a/usr/src/sys/hp/dev/grf.c
+++ b/usr/src/sys/hp/dev/grf.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf.c 1.32 92/01/21$
   *
   *
   * from: Utah $Hdr: grf.c 1.32 92/01/21$
   *
- *     @(#)grf.c       7.13 (Berkeley) %G%
+ *     @(#)grf.c       7.14 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,7 +20,7 @@
   * Hardware access is through the machine dependent grf switch routines.
   */
  
   * Hardware access is through the machine dependent grf switch routines.
   */
  
-#include <grf.h>
+#include "grf.h"
  #if NGRF > 0
  
  #include <sys/param.h>
  #if NGRF > 0
  
  #include <sys/param.h>
diff --git a/usr/src/sys/hp/dev/hil.c b/usr/src/sys/hp/dev/hil.c

index d37bdc3..dd4aaad 100644 (file)
--- a/usr/src/sys/hp/dev/hil.c
+++ b/usr/src/sys/hp/dev/hil.c
@@ -11,32 +11,32 @@
   *
   * from: Utah $Hdr: hil.c 1.38 92/01/21$
   *
   *
   * from: Utah $Hdr: hil.c 1.38 92/01/21$
   *
- *     @(#)hil.c       7.13 (Berkeley) %G%
+ *     @(#)hil.c       7.14 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/conf.h"
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "sys/ioctl.h"
-#include "sys/file.h"
-#include "sys/tty.h"
-#include "sys/systm.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-
-#include "hilreg.h"
-#include "hilioctl.h"
-#include "hilvar.h"
-#include "kbdmap.h"
-
-#include "machine/cpu.h"
-
-#include "vm/vm_param.h"
-#include "vm/vm_map.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
-#include "vm/vm_pager.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+
+#include <hp/dev/hilreg.h>
+#include <hp/dev/hilioctl.h>
+#include <hp/dev/hilvar.h>
+#include <hp/dev/kbdmap.h>
+
+#include <machine/cpu.h>
+
+#include <vm/vm_param.h>
+#include <vm/vm_map.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
  
  #ifdef hp300
  #define NHIL   1       /* XXX */
  
  #ifdef hp300
  #define NHIL   1       /* XXX */
diff --git a/usr/src/sys/hp/dev/hil_keymaps.c b/usr/src/sys/hp/dev/hil_keymaps.c

index bfffe09..5edbd85 100644 (file)
--- a/usr/src/sys/hp/dev/hil_keymaps.c
+++ b/usr/src/sys/hp/dev/hil_keymaps.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: hil_keymaps.c 1.1 90/07/09$
   *
   *
   * from: Utah $Hdr: hil_keymaps.c 1.1 90/07/09$
   *
- *     @(#)hil_keymaps.c       7.3 (Berkeley) %G%
+ *     @(#)hil_keymaps.c       7.4 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -34,8 +34,8 @@
   * space.  Having keymaps for all 18 or so HP supported layouts would be bad
   * news.
   */
   * space.  Having keymaps for all 18 or so HP supported layouts would be bad
   * news.
   */
-#include "sys/param.h"
-#include "kbdmap.h"
+#include <sys/param.h>
+#include <hp/dev/kbdmap.h>
  
  char   us_keymap[] = {
         NULL,   '`',    '\\',   ESC,    NULL,   DEL,    NULL,   NULL,  
  
  char   us_keymap[] = {
         NULL,   '`',    '\\',   ESC,    NULL,   DEL,    NULL,   NULL,  
diff --git a/usr/src/sys/hp/dev/hil_subr.c b/usr/src/sys/hp/dev/hil_subr.c

index 0fec3f6..4336116 100644 (file)
--- a/usr/src/sys/hp/dev/hil_subr.c
+++ b/usr/src/sys/hp/dev/hil_subr.c
@@ -7,16 +7,16 @@
   *
   * from: Utah $Hdr: hil_subr.c 1.1 91/11/19$
   *
   *
   * from: Utah $Hdr: hil_subr.c 1.1 91/11/19$
   *
- *     @(#)hil_subr.c  7.2 (Berkeley) %G%
+ *     @(#)hil_subr.c  7.3 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/clist.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/clist.h>
  
  
-#include "hilreg.h"
+#include <hp/dev/hilreg.h>
  
  /*
   * XXX this file only exists to separate out the AT&T tainted code.
  
  /*
   * XXX this file only exists to separate out the AT&T tainted code.
diff --git a/usr/src/sys/hp/dev/hilreg.h b/usr/src/sys/hp/dev/hilreg.h

index 069ac8a..c84f697 100644 (file)
--- a/usr/src/sys/hp/dev/hilreg.h
+++ b/usr/src/sys/hp/dev/hilreg.h
@@ -11,14 +11,10 @@
   *
   * from: Utah $Hdr: hilreg.h 1.10 92/01/21$
   *
   *
   * from: Utah $Hdr: hilreg.h 1.10 92/01/21$
   *
- *     @(#)hilreg.h    7.4 (Berkeley) %G%
+ *     @(#)hilreg.h    7.5 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
-#include <hp/dev/iotypes.h>    /* XXX */
-#endif
+#include <hp/dev/iotypes.h>            /* XXX */
  
  #ifdef hp300
  struct hil_dev {
  
  #ifdef hp300
  struct hil_dev {
diff --git a/usr/src/sys/hp/dev/ite.c b/usr/src/sys/hp/dev/ite.c

index 0a87596..d2fa63a 100644 (file)
--- a/usr/src/sys/hp/dev/ite.c
+++ b/usr/src/sys/hp/dev/ite.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: ite.c 1.24 92/01/21$
   *
   *
   * from: Utah $Hdr: ite.c 1.24 92/01/21$
   *
- *     @(#)ite.c       7.13 (Berkeley) %G%
+ *     @(#)ite.c       7.14 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -27,18 +27,18 @@
  #undef NITE
  #define NITE   NGRF
  
  #undef NITE
  #define NITE   NGRF
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
  
  
-#include "grfioctl.h"
-#include "grfvar.h"
-#include "itevar.h"
-#include "kbdmap.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/kbdmap.h>
  
  #define set_attr(ip, attr)     ((ip)->attribute |= (attr))
  #define clr_attr(ip, attr)     ((ip)->attribute &= ~(attr))
  
  #define set_attr(ip, attr)     ((ip)->attribute |= (attr))
  #define clr_attr(ip, attr)     ((ip)->attribute &= ~(attr))
@@ -718,9 +718,9 @@ ite_clrtoeos(ip, sp)
  /*
   * Console functions
   */
  /*
   * Console functions
   */
-#include "cons.h"
+#include <hp/dev/cons.h>
  #ifdef hp300
  #ifdef hp300
-#include "grfreg.h"
+#include <hp/dev/grfreg.h>
  #endif
  
  #ifdef DEBUG
  #endif
  
  #ifdef DEBUG
diff --git a/usr/src/sys/hp/dev/ite_subr.c b/usr/src/sys/hp/dev/ite_subr.c

index 97a4e9b..6ffd25d 100644 (file)
--- a/usr/src/sys/hp/dev/ite_subr.c
+++ b/usr/src/sys/hp/dev/ite_subr.c
@@ -11,23 +11,23 @@
   *
   * from: Utah $Hdr: ite_subr.c 1.4 92/01/21$
   *
   *
   * from: Utah $Hdr: ite_subr.c 1.4 92/01/21$
   *
- *     @(#)ite_subr.c  7.5 (Berkeley) %G%
+ *     @(#)ite_subr.c  7.6 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
  
  
-#include "itevar.h"
-#include "itereg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  ite_fontinfo(ip)
         struct ite_softc *ip;
  
  ite_fontinfo(ip)
         struct ite_softc *ip;
diff --git a/usr/src/sys/hp/hpux/hpux.h b/usr/src/sys/hp/hpux/hpux.h

index c3043d3..4367b63 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux.h
+++ b/usr/src/sys/hp/hpux/hpux.h
@@ -11,10 +11,10 @@
   *
   * from: Utah $Hdr: hpux.h 1.19 92/01/20$
   *
   *
   * from: Utah $Hdr: hpux.h 1.19 92/01/20$
   *
- *     @(#)hpux.h      7.6 (Berkeley) %G%
+ *     @(#)hpux.h      7.7 (Berkeley) %G%
   */
  
   */
  
-#include "hpux_exec.h"
+#include <hp/hpux/hpux_exec.h>
  
  /* HP-UX style UTSNAME struct used by uname syscall */
  
  
  /* HP-UX style UTSNAME struct used by uname syscall */
  
diff --git a/usr/src/sys/hp/hpux/hpux_compat.c b/usr/src/sys/hp/hpux/hpux_compat.c

index 4806059..ee41fb6 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux_compat.c
+++ b/usr/src/sys/hp/hpux/hpux_compat.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: hpux_compat.c 1.43 92/04/23$
   *
   *
   * from: Utah $Hdr: hpux_compat.c 1.43 92/04/23$
   *
- *     @(#)hpux_compat.c       7.31 (Berkeley) %G%
+ *     @(#)hpux_compat.c       7.32 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,32 +20,33 @@
  
  #ifdef HPUXCOMPAT
  
  
  #ifdef HPUXCOMPAT
  
-#include "param.h"
-#include "systm.h"
-#include "signalvar.h"
-#include "kernel.h"
-#include "filedesc.h"
-#include "proc.h"
-#include "buf.h"
-#include "wait.h"
-#include "file.h"
-#include "namei.h"
-#include "vnode.h"
-#include "ioctl.h"
-#include "ptrace.h"
-#include "stat.h"
-#include "syslog.h"
-#include "malloc.h"
-#include "mount.h"
-#include "ipc.h"
-#include "user.h"
-
-#include "machine/cpu.h"
-#include "machine/reg.h"
-#include "machine/psl.h"
-#include "machine/vmparam.h"
-#include "hpux.h"
-#include "hpux_termio.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/filedesc.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/wait.h>
+#include <sys/file.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/ioctl.h>
+#include <sys/ptrace.h>
+#include <sys/stat.h>
+#include <sys/syslog.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/ipc.h>
+#include <sys/user.h>
+
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <machine/vmparam.h>
+
+#include <hp/hpux/hpux.h>
+#include <hp/hpux/hpux_termio.h>
  
  #ifdef DEBUG
  int unimpresponse = 0;
  
  #ifdef DEBUG
  int unimpresponse = 0;
@@ -826,7 +827,7 @@ hpuxsetdomainname(p, uap, retval)
  }
  
  #ifdef SYSVSHM
  }
  
  #ifdef SYSVSHM
-#include "shm.h"
+#include <sys/shm.h>
  
  hpuxshmat(p, uap, retval)
         struct proc *p;
  
  hpuxshmat(p, uap, retval)
         struct proc *p;
@@ -974,7 +975,7 @@ extern int hilopen();
  #endif
  #endif
  
  #endif
  #endif
  
-#include "conf.h"
+#include <sys/conf.h>
  
  bsdtohpuxstat(sb, hsb)
         struct stat *sb;
  
  bsdtohpuxstat(sb, hsb)
         struct stat *sb;
@@ -1641,7 +1642,7 @@ hpuxdumpu(vp, cred)
  
  #define HPUX_HZ        50
  
  
  #define HPUX_HZ        50
  
-#include "sys/times.h"
+#include <sys/times.h>
  
  /* from old timeb.h */
  struct hpuxtimeb {
  
  /* from old timeb.h */
  struct hpuxtimeb {
diff --git a/usr/src/sys/hp/hpux/hpux_net.c b/usr/src/sys/hp/hpux/hpux_net.c

index 9897b9e..8456ebe 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux_net.c
+++ b/usr/src/sys/hp/hpux/hpux_net.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: hpux_net.c 1.33 89/08/23$
   *
   *
   * from: Utah $Hdr: hpux_net.c 1.33 89/08/23$
   *
- *     @(#)hpux_net.c  7.7 (Berkeley) %G%
+ *     @(#)hpux_net.c  7.8 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,19 +20,20 @@
  
  #ifdef HPUXCOMPAT
  
  
  #ifdef HPUXCOMPAT
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/kernel.h"
-#include "sys/time.h"
-#include "sys/errno.h"
-#include "sys/proc.h"
-#include "sys/file.h"
-#include "sys/mbuf.h"
-#include "sys/socket.h"
-#include "sys/socketvar.h"
-#include "sys/uio.h"
-#include "sys/ktrace.h"
-#include "hpux.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/time.h>
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/uio.h>
+#include <sys/ktrace.h>
+
+#include <hp/hpux/hpux.h>
  
  #define MINBSDIPCCODE  0x3EE
  #define NUMBSDIPC      32
  
  #define MINBSDIPCCODE  0x3EE
  #define NUMBSDIPC      32
diff --git a/usr/src/sys/hp/hpux/hpux_sig.c b/usr/src/sys/hp/hpux/hpux_sig.c

index 79a188d..72c3af2 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux_sig.c
+++ b/usr/src/sys/hp/hpux/hpux_sig.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: hpux_sig.c 1.4 92/01/20$
   *
   *
   * from: Utah $Hdr: hpux_sig.c 1.4 92/01/20$
   *
- *     @(#)hpux_sig.c  7.12 (Berkeley) %G%
+ *     @(#)hpux_sig.c  7.13 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,12 +20,13 @@
  
  #ifdef HPUXCOMPAT
  
  
  #ifdef HPUXCOMPAT
  
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "proc.h"
-#include "signalvar.h"
-#include "hpux.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
+
+#include <hp/hpux/hpux.h>
  
  /* indexed by HPUX signal number - 1 */
  char hpuxtobsdsigmap[NSIG] = {
  
  /* indexed by HPUX signal number - 1 */
  char hpuxtobsdsigmap[NSIG] = {
diff --git a/usr/src/sys/hp/hpux/hpux_tty.c b/usr/src/sys/hp/hpux/hpux_tty.c

index 84e4537..3c3bb50 100644 (file)
--- a/usr/src/sys/hp/hpux/hpux_tty.c
+++ b/usr/src/sys/hp/hpux/hpux_tty.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: hpux_tty.c 1.1 90/07/09$
   *
   *
   * from: Utah $Hdr: hpux_tty.c 1.1 90/07/09$
   *
- *     @(#)hpux_tty.c  7.12 (Berkeley) %G%
+ *     @(#)hpux_tty.c  7.13 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -19,19 +19,19 @@
   */
  #ifdef HPUXCOMPAT
  
   */
  #ifdef HPUXCOMPAT
  
-#include "param.h"
-#include "systm.h"
-#include "filedesc.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "file.h"
-#include "conf.h"
-#include "buf.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/filedesc.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/kernel.h>
  
  
-#include "hpux.h"
-#include "hpux_termio.h"
+#include <hp/hpux/hpux.h>
+#include <hp/hpux/hpux_termio.h>
  
  /*
   * Map BSD/POSIX style termios info to and from SYS5 style termio stuff.
  
  /*
   * Map BSD/POSIX style termios info to and from SYS5 style termio stuff.
diff --git a/usr/src/sys/hp/hpux/makesyscalls.sh b/usr/src/sys/hp/hpux/makesyscalls.sh

index e7cfaca..6fe9458 100644 (file)
--- a/usr/src/sys/hp/hpux/makesyscalls.sh
+++ b/usr/src/sys/hp/hpux/makesyscalls.sh
@@ -1,5 +1,5 @@
  #! /bin/sh -
  #! /bin/sh -
-#      @(#)makesyscalls.sh     7.1 (Berkeley) %G%
+#      @(#)makesyscalls.sh     7.2 (Berkeley) %G%
  
  set -e
  
  
  set -e
  
@@ -49,8 +49,8 @@ awk < $1 "
         }
         NR == 1 {
                 printf " * created from%s\n */\n\n", $0 > sysdcl
         }
         NR == 1 {
                 printf " * created from%s\n */\n\n", $0 > sysdcl
-               printf "#include \"param.h\"\n" > sysdcl
-               printf "#include \"systm.h\"\n\n" > sysdcl
+               printf "#include <sys/param.h>\n" > sysdcl
+               printf "#include <sys/systm.h>\n\n" > sysdcl
                 printf "int\tnosys(),notimp();\n\n" > sysdcl
  
                 printf "struct sysent hpuxsysent[] = {\n" > sysent
                 printf "int\tnosys(),notimp();\n\n" > sysdcl
  
                 printf "struct sysent hpuxsysent[] = {\n" > sysent
diff --git a/usr/src/sys/hp300/dev/ac.c b/usr/src/sys/hp300/dev/ac.c

index cd5b4be..ec2c611 100644 (file)
--- a/usr/src/sys/hp300/dev/ac.c
+++ b/usr/src/sys/hp300/dev/ac.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: ac.c 1.5 92/01/21$
   *
   *
   * from: Utah $Hdr: ac.c 1.5 92/01/21$
   *
- *     @(#)ac.c        7.1 (Berkeley) %G%
+ *     @(#)ac.c        7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -26,18 +26,19 @@
  #include "ac.h"
  #if NAC > 0
  
  #include "ac.h"
  #if NAC > 0
  
-#include "param.h"
-#include "buf.h"
-#include "errno.h"
-#include "user.h"
-#include "ioctl.h"
-#include "kernel.h"
-#include "malloc.h"
-
-#include "hp/dev/device.h"
-#include "scsireg.h"
-#include "acioctl.h"
-#include "acvar.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/errno.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <hp/dev/device.h>
+
+#include <hp300/dev/scsireg.h>
+#include <hp300/dev/acioctl.h>
+#include <hp300/dev/acvar.h>
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
diff --git a/usr/src/sys/hp300/dev/cons_conf.c b/usr/src/sys/hp300/dev/cons_conf.c

index 3ddb4a5..0b817cd 100644 (file)
--- a/usr/src/sys/hp300/dev/cons_conf.c
+++ b/usr/src/sys/hp300/dev/cons_conf.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: cons_conf.c 1.1 92/01/21
   *
   *
   * from: Utah $Hdr: cons_conf.c 1.1 92/01/21
   *
- *     @(#)cons_conf.c 7.1 (Berkeley) %G%
+ *     @(#)cons_conf.c 7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,8 +20,9 @@
   * the standalone boot.  I think it best that they both use the same
   * known algorithm unless we see a pressing need otherwise.
   */
   * the standalone boot.  I think it best that they both use the same
   * known algorithm unless we see a pressing need otherwise.
   */
-#include "sys/types.h"
-#include "hp/dev/cons.h"
+#include <sys/types.h>
+
+#include <hp/dev/cons.h>
  
  #include "ite.h"
  #include "dca.h"
  
  #include "ite.h"
  #include "dca.h"
diff --git a/usr/src/sys/hp300/dev/ct.c b/usr/src/sys/hp300/dev/ct.c

index 681f4f5..e995142 100644 (file)
--- a/usr/src/sys/hp300/dev/ct.c
+++ b/usr/src/sys/hp300/dev/ct.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)ct.c        7.5 (Berkeley) %G%
+ *     @(#)ct.c        7.6 (Berkeley) %G%
   */
  
  #include "ct.h"
   */
  
  #include "ct.h"
@@ -23,15 +23,16 @@
   *     finish support of 9145
   */
  
   *     finish support of 9145
   */
  
-#include "param.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "mtio.h"
-#include "tprintf.h"
-#include "proc.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/mtio.h>
+#include <sys/tprintf.h>
+#include <sys/proc.h>
  
  
-#include "hp/dev/device.h"
-#include "ctreg.h"
+#include <hp/dev/device.h>
+
+#include <hp300/dev/ctreg.h>
  
  /* number of eof marks to remember */
  #define EOFS   128
  
  /* number of eof marks to remember */
  #define EOFS   128
diff --git a/usr/src/sys/hp300/dev/dcm.c b/usr/src/sys/hp300/dev/dcm.c

index 182ae9c..e953fec 100644 (file)
--- a/usr/src/sys/hp300/dev/dcm.c
+++ b/usr/src/sys/hp300/dev/dcm.c
@@ -11,7 +11,7 @@
   *
   * from Utah: $Hdr: dcm.c 1.29 92/01/21$
   *
   *
   * from Utah: $Hdr: dcm.c 1.29 92/01/21$
   *
- *     @(#)dcm.c       7.19 (Berkeley) %G%
+ *     @(#)dcm.c       7.20 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -25,22 +25,23 @@
  /*
   *  98642/MUX
   */
  /*
   *  98642/MUX
   */
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/proc.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
-#include "sys/file.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/syslog.h"
-#include "sys/time.h"
-
-#include "hp/dev/device.h"
-#include "dcmreg.h"
-#include "machine/cpu.h"
-#include "../hp300/isr.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+#include <sys/time.h>
+
+#include <hp/dev/device.h>
+
+#include <hp300/dev/dcmreg.h>
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>
  
  #ifndef DEFAULT_BAUD_RATE
  #define DEFAULT_BAUD_RATE 9600
  
  #ifndef DEFAULT_BAUD_RATE
  #define DEFAULT_BAUD_RATE 9600
@@ -122,7 +123,7 @@ extern      struct tty *constty;
  /*
   * Kernel GDB support
   */
  /*
   * Kernel GDB support
   */
-#include "machine/remote-sl.h"
+#include <machine/remote-sl.h>
  
  extern dev_t kgdb_dev;
  extern int kgdb_rate;
  
  extern dev_t kgdb_dev;
  extern int kgdb_rate;
@@ -1107,7 +1108,7 @@ dcmsetischeme(brd, flags)
  /*
   * Following are all routines needed for DCM to act as console
   */
  /*
   * Following are all routines needed for DCM to act as console
   */
-#include "hp/dev/cons.h"
+#include <hp/dev/cons.h>
  
  dcmcnprobe(cp)
         struct consdev *cp;
  
  dcmcnprobe(cp)
         struct consdev *cp;
diff --git a/usr/src/sys/hp300/dev/dcmreg.h b/usr/src/sys/hp300/dev/dcmreg.h

index 2a03b36..76c3f28 100644 (file)
--- a/usr/src/sys/hp300/dev/dcmreg.h
+++ b/usr/src/sys/hp300/dev/dcmreg.h
@@ -11,14 +11,10 @@
   *
   * from: Utah $Hdr: dcmreg.h 1.7 92/01/21$
   *
   *
   * from: Utah $Hdr: dcmreg.h 1.7 92/01/21$
   *
- *     @(#)dcmreg.h    7.5 (Berkeley) %G%
+ *     @(#)dcmreg.h    7.6 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
-#include <hp/dev/iotypes.h>    /* XXX */
-#endif
+#include <hp/dev/iotypes.h>            /* XXX */
  
  struct dcmdevice {        /* host address, only odd bytes addressed */
         u_char  dcm_pad0;
  
  struct dcmdevice {        /* host address, only odd bytes addressed */
         u_char  dcm_pad0;
diff --git a/usr/src/sys/hp300/dev/dma.c b/usr/src/sys/hp300/dev/dma.c

index 6a47673..7a14d04 100644 (file)
--- a/usr/src/sys/hp300/dev/dma.c
+++ b/usr/src/sys/hp300/dev/dma.c
@@ -4,25 +4,26 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dma.c       7.6 (Berkeley) %G%
+ *     @(#)dma.c       7.7 (Berkeley) %G%
   */
  
  /*
   * DMA driver
   */
  
   */
  
  /*
   * DMA driver
   */
  
-#include "param.h"
-#include "systm.h"
-#include "time.h"
-#include "kernel.h"
-#include "proc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
  
  
-#include "dmareg.h"
-#include "dmavar.h"
-#include "hp/dev/device.h"
+#include <hp300/dev/dmareg.h>
+#include <hp300/dev/dmavar.h>
  
  
-#include "../include/cpu.h"
-#include "../hp300/isr.h"
+#include <hp/dev/device.h>
+
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>
  
  extern void isrlink();
  extern void _insque();
  
  extern void isrlink();
  extern void _insque();
diff --git a/usr/src/sys/hp300/dev/dmareg.h b/usr/src/sys/hp300/dev/dmareg.h

index 2a0624a..30ed83d 100644 (file)
--- a/usr/src/sys/hp300/dev/dmareg.h
+++ b/usr/src/sys/hp300/dev/dmareg.h
@@ -4,14 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dmareg.h    7.4 (Berkeley) %G%
+ *     @(#)dmareg.h    7.5 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
-#include <hp/dev/iotypes.h>    /* XXX */
-#endif
+#include <hp/dev/iotypes.h>            /* XXX */
  
  /*
   * Hardware layout for the 98620[ABC]:
  
  /*
   * Hardware layout for the 98620[ABC]:
diff --git a/usr/src/sys/hp300/dev/fhpib.c b/usr/src/sys/hp300/dev/fhpib.c

index 0cbe802..4a89276 100644 (file)
--- a/usr/src/sys/hp300/dev/fhpib.c
+++ b/usr/src/sys/hp300/dev/fhpib.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fhpib.c     7.5 (Berkeley) %G%
+ *     @(#)fhpib.c     7.6 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,13 +13,15 @@
  #include "hpib.h"
  #if NHPIB > 0
  
  #include "hpib.h"
  #if NHPIB > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "hp/dev/device.h"
-#include "fhpibreg.h"
-#include "hpibvar.h"
-#include "dmavar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+
+#include <hp/dev/device.h>
+
+#include <hp300/dev/fhpibreg.h>
+#include <hp300/dev/hpibvar.h>
+#include <hp300/dev/dmavar.h>
  
  /*
   * Inline version of fhpibwait to be used in places where
  
  /*
   * Inline version of fhpibwait to be used in places where
diff --git a/usr/src/sys/hp300/dev/fhpibreg.h b/usr/src/sys/hp300/dev/fhpibreg.h

index f5fb2b1..3ac9074 100644 (file)
--- a/usr/src/sys/hp300/dev/fhpibreg.h
+++ b/usr/src/sys/hp300/dev/fhpibreg.h
@@ -4,14 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fhpibreg.h  7.2 (Berkeley) %G%
+ *     @(#)fhpibreg.h  7.3 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  struct fhpibdevice {
         u_char  hpib_pad0;
  
  struct fhpibdevice {
         u_char  hpib_pad0;
diff --git a/usr/src/sys/hp300/dev/grf_conf.c b/usr/src/sys/hp300/dev/grf_conf.c

index ebc9a8d..cf74670 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_conf.c
+++ b/usr/src/sys/hp300/dev/grf_conf.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_conf.c 1.2 92/01/22$
   *
   *
   * from: Utah $Hdr: grf_conf.c 1.2 92/01/22$
   *
- *     @(#)grf_conf.c  7.1 (Berkeley) %G%
+ *     @(#)grf_conf.c  7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,11 +20,12 @@
  #include "grf.h"
  #if NGRF > 0
  
  #include "grf.h"
  #if NGRF > 0
  
-#include "sys/types.h"
-#include "hp/dev/device.h"
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "hp/dev/grfreg.h"
+#include <sys/types.h>
+
+#include <hp/dev/device.h>
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp/dev/grfreg.h>
  
  extern int tc_init(), tc_mode();
  extern int gb_init(), gb_mode();
  
  extern int tc_init(), tc_mode();
  extern int gb_init(), gb_mode();
@@ -47,7 +48,7 @@ int   ngrfsw = sizeof(grfsw) / sizeof(grfsw[0]);
  #include "ite.h"
  #if NITE > 0
  
  #include "ite.h"
  #if NITE > 0
  
-#include "hp/dev/itevar.h"
+#include <hp/dev/itevar.h>
  
  extern u_char ite_readbyte();
  extern int ite_writeglyph();
  
  extern u_char ite_readbyte();
  extern int ite_writeglyph();
diff --git a/usr/src/sys/hp300/dev/grf_dv.c b/usr/src/sys/hp300/dev/grf_dv.c

index 0e14d08..903f28b 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_dv.c
+++ b/usr/src/sys/hp300/dev/grf_dv.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_dv.c 1.11 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_dv.c 1.11 92/01/21$
   *
- *     @(#)grf_dv.c    7.5 (Berkeley) %G%
+ *     @(#)grf_dv.c    7.6 (Berkeley) %G%
   */
  
  #include "grf.h"
   */
  
  #include "grf.h"
@@ -20,14 +20,14 @@
  /*
   * Graphics routines for the DaVinci, HP98730/98731 Graphics system.
   */
  /*
   * Graphics routines for the DaVinci, HP98730/98731 Graphics system.
   */
-#include "sys/param.h"
-#include "sys/errno.h"
+#include <sys/param.h>
+#include <sys/errno.h>
  
  
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "grf_dvreg.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp300/dev/grf_dvreg.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  /*
   * Initialize hardware.
  
  /*
   * Initialize hardware.
diff --git a/usr/src/sys/hp300/dev/grf_dvreg.h b/usr/src/sys/hp300/dev/grf_dvreg.h

index 3418a44..be028ac 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_dvreg.h
+++ b/usr/src/sys/hp300/dev/grf_dvreg.h
@@ -11,14 +11,10 @@
   *
   * from: Utah $Hdr: grf_dvreg.h 1.5 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_dvreg.h 1.5 92/01/21$
   *
- *     @(#)grf_dvreg.h 7.3 (Berkeley) %G%
+ *     @(#)grf_dvreg.h 7.4 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  /*
   * Map of the DaVinci frame buffer controller chip in memory ...
  
  /*
   * Map of the DaVinci frame buffer controller chip in memory ...
diff --git a/usr/src/sys/hp300/dev/grf_gb.c b/usr/src/sys/hp300/dev/grf_gb.c

index 040b7b6..6df7756 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_gb.c
+++ b/usr/src/sys/hp300/dev/grf_gb.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_gb.c 1.17 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_gb.c 1.17 92/01/21$
   *
- *     @(#)grf_gb.c    7.5 (Berkeley) %G%
+ *     @(#)grf_gb.c    7.6 (Berkeley) %G%
   */
  
  #include "grf.h"
   */
  
  #include "grf.h"
@@ -24,14 +24,14 @@
   *       HP 987x0 graphics systems.  "Gator" is not used for high res mono.
   *       (as in 9837 Gator systems)
   */
   *       HP 987x0 graphics systems.  "Gator" is not used for high res mono.
   *       (as in 9837 Gator systems)
   */
-#include "sys/param.h"
-#include "sys/errno.h"
+#include <sys/param.h>
+#include <sys/errno.h>
  
  
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "grf_gbreg.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  
-#include "../include/cpu.h"
+#include <hp300/dev/grf_gbreg.h>
+#include <machine/cpu.h>
  
  #define CRTC_DATA_LENGTH  0x0e
  u_char crtc_init_data[CRTC_DATA_LENGTH] = {
  
  #define CRTC_DATA_LENGTH  0x0e
  u_char crtc_init_data[CRTC_DATA_LENGTH] = {
diff --git a/usr/src/sys/hp300/dev/grf_gbreg.h b/usr/src/sys/hp300/dev/grf_gbreg.h

index 7888cac..8cc4d80 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_gbreg.h
+++ b/usr/src/sys/hp300/dev/grf_gbreg.h
@@ -11,14 +11,10 @@
   *
   * from: Utah $Hdr: grf_gbreg.h 1.11 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_gbreg.h 1.11 92/01/21$
   *
- *     @(#)grf_gbreg.h 7.3 (Berkeley) %G%
+ *     @(#)grf_gbreg.h 7.4 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  /*
   * Gatorbox driver regs
  
  /*
   * Gatorbox driver regs
diff --git a/usr/src/sys/hp300/dev/grf_hy.c b/usr/src/sys/hp300/dev/grf_hy.c

index 00e631d..5283ef6 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_hy.c
+++ b/usr/src/sys/hp300/dev/grf_hy.c
@@ -12,7 +12,7 @@
   *
   * from: Utah $Hdr: grf_hy.c 1.1 92/01/22$
   *
   *
   * from: Utah $Hdr: grf_hy.c 1.1 92/01/22$
   *
- *     @(#)grf_hy.c    7.1 (Berkeley) %G%
+ *     @(#)grf_hy.c    7.2 (Berkeley) %G%
   */
  
  #include "grf.h"
   */
  
  #include "grf.h"
@@ -21,14 +21,14 @@
  /*
   * Graphics routines for HYPERION frame buffer
   */
  /*
   * Graphics routines for HYPERION frame buffer
   */
-#include "sys/param.h"
-#include "sys/errno.h"
+#include <sys/param.h>
+#include <sys/errno.h>
  
  
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "grf_hyreg.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp300/dev/grf_hyreg.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  caddr_t badhyaddr = (caddr_t) -1;
  
  
  caddr_t badhyaddr = (caddr_t) -1;
  
diff --git a/usr/src/sys/hp300/dev/grf_hyreg.h b/usr/src/sys/hp300/dev/grf_hyreg.h

index dee6141..c2fc45a 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_hyreg.h
+++ b/usr/src/sys/hp300/dev/grf_hyreg.h
@@ -12,14 +12,10 @@
   *
   * from: Utah $Hdr: grf_hyreg.h 1.1 92/01/22$
   *
   *
   * from: Utah $Hdr: grf_hyreg.h 1.1 92/01/22$
   *
- *     @(#)grf_hyreg.h 7.1 (Berkeley) %G%
+ *     @(#)grf_hyreg.h 7.2 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  struct hyboxfb {
    u_char       :8;
  
  struct hyboxfb {
    u_char       :8;
diff --git a/usr/src/sys/hp300/dev/grf_machdep.c b/usr/src/sys/hp300/dev/grf_machdep.c

index c83da42..f1323d7 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_machdep.c
+++ b/usr/src/sys/hp300/dev/grf_machdep.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_machdep.c 1.1 92/01/21
   *
   *
   * from: Utah $Hdr: grf_machdep.c 1.1 92/01/21
   *
- *     @(#)grf_machdep.c       7.1 (Berkeley) %G%
+ *     @(#)grf_machdep.c       7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,12 +22,12 @@
  #include "grf.h"
  #if NGRF > 0
  
  #include "grf.h"
  #if NGRF > 0
  
-#include "sys/param.h"
+#include <sys/param.h>
  
  
-#include "hp/dev/device.h"
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "hp/dev/grfreg.h"
+#include <hp/dev/device.h>
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp/dev/grfreg.h>
  
  int grfprobe();
  struct driver grfdriver = { grfprobe, "grf" };
  
  int grfprobe();
  struct driver grfdriver = { grfprobe, "grf" };
diff --git a/usr/src/sys/hp300/dev/grf_rb.c b/usr/src/sys/hp300/dev/grf_rb.c

index 7d25977..4f7812c 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_rb.c
+++ b/usr/src/sys/hp300/dev/grf_rb.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_rb.c 1.14 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_rb.c 1.14 92/01/21$
   *
- *     @(#)grf_rb.c    7.6 (Berkeley) %G%
+ *     @(#)grf_rb.c    7.7 (Berkeley) %G%
   */
  
  #include "grf.h"
   */
  
  #include "grf.h"
@@ -20,14 +20,14 @@
  /*
   * Graphics routines for the Renaissance, HP98720 Graphics system.
   */
  /*
   * Graphics routines for the Renaissance, HP98720 Graphics system.
   */
-#include "sys/param.h"
-#include "sys/errno.h"
+#include <sys/param.h>
+#include <sys/errno.h>
  
  
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "grf_rbreg.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp300/dev/grf_rbreg.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  /*
   * Initialize hardware.
  
  /*
   * Initialize hardware.
diff --git a/usr/src/sys/hp300/dev/grf_rbreg.h b/usr/src/sys/hp300/dev/grf_rbreg.h

index c97c13f..29e605f 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_rbreg.h
+++ b/usr/src/sys/hp300/dev/grf_rbreg.h
@@ -11,18 +11,14 @@
   *
   * from: Utah $Hdr: grf_rbreg.h 1.9 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_rbreg.h 1.9 92/01/21$
   *
- *     @(#)grf_rbreg.h 7.3 (Berkeley) %G%
+ *     @(#)grf_rbreg.h 7.4 (Berkeley) %G%
   */
  
  /*
   * Map of the Renaissance frame buffer controller chip in memory ...
   */
  
   */
  
  /*
   * Map of the Renaissance frame buffer controller chip in memory ...
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  #define rb_waitbusy(regaddr) \
         while (((struct rboxfb *)(regaddr))->wbusy & 0x01) DELAY(100)
  
  #define rb_waitbusy(regaddr) \
         while (((struct rboxfb *)(regaddr))->wbusy & 0x01) DELAY(100)
diff --git a/usr/src/sys/hp300/dev/grf_tc.c b/usr/src/sys/hp300/dev/grf_tc.c

index 9dcb50d..691ec3d 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_tc.c
+++ b/usr/src/sys/hp300/dev/grf_tc.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: grf_tc.c 1.19 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_tc.c 1.19 92/01/21$
   *
- *     @(#)grf_tc.c    7.5 (Berkeley) %G%
+ *     @(#)grf_tc.c    7.6 (Berkeley) %G%
   */
  
  #include "grf.h"
   */
  
  #include "grf.h"
@@ -20,14 +20,14 @@
  /*
   * Graphics routines for TOPCAT and CATSEYE frame buffers
   */
  /*
   * Graphics routines for TOPCAT and CATSEYE frame buffers
   */
-#include "sys/param.h"
-#include "sys/errno.h"
+#include <sys/param.h>
+#include <sys/errno.h>
  
  
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
-#include "grf_tcreg.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
+#include <hp300/dev/grf_tcreg.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  /*
   * Initialize hardware.
  
  /*
   * Initialize hardware.
diff --git a/usr/src/sys/hp300/dev/grf_tcreg.h b/usr/src/sys/hp300/dev/grf_tcreg.h

index 74b822a..ba9c1ff 100644 (file)
--- a/usr/src/sys/hp300/dev/grf_tcreg.h
+++ b/usr/src/sys/hp300/dev/grf_tcreg.h
@@ -11,14 +11,10 @@
   *
   * from: Utah $Hdr: grf_tcreg.h 1.11 92/01/21$
   *
   *
   * from: Utah $Hdr: grf_tcreg.h 1.11 92/01/21$
   *
- *     @(#)grf_tcreg.h 7.4 (Berkeley) %G%
+ *     @(#)grf_tcreg.h 7.5 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  #define tccm_waitbusy(regaddr) \
         while (((struct tcboxfb *)(regaddr))->cmap_busy & 0x04) DELAY(100)
  
  #define tccm_waitbusy(regaddr) \
         while (((struct tcboxfb *)(regaddr))->cmap_busy & 0x04) DELAY(100)
diff --git a/usr/src/sys/hp300/dev/hpib.c b/usr/src/sys/hp300/dev/hpib.c

index a1cb907..ecc29db 100644 (file)
--- a/usr/src/sys/hp300/dev/hpib.c
+++ b/usr/src/sys/hp300/dev/hpib.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)hpib.c      7.7 (Berkeley) %G%
+ *     @(#)hpib.c      7.8 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,15 +13,16 @@
  #include "hpib.h"
  #if NHPIB > 0
  
  #include "hpib.h"
  #if NHPIB > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "hp/dev/device.h"
-#include "hpibvar.h"
-#include "dmavar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
  
  
-#include "../include/cpu.h"
-#include "../hp300/isr.h"
+#include <hp/dev/device.h>
+#include <hp300/dev/hpibvar.h>
+#include <hp300/dev/dmavar.h>
+
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>
  
  int    hpibinit(), hpibstart(), hpibgo(), hpibintr(), hpibdone();
  struct driver hpibdriver = {
  
  int    hpibinit(), hpibstart(), hpibgo(), hpibintr(), hpibdone();
  struct driver hpibdriver = {
diff --git a/usr/src/sys/hp300/dev/if_le.c b/usr/src/sys/hp300/dev/if_le.c

index 9943d77..00c4254 100644 (file)
--- a/usr/src/sys/hp300/dev/if_le.c
+++ b/usr/src/sys/hp300/dev/if_le.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_le.c     7.12 (Berkeley) %G%
+ *     @(#)if_le.c     7.13 (Berkeley) %G%
   */
  
  #include "le.h"
   */
  
  #include "le.h"
@@ -20,43 +20,43 @@
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
-#include "sys/param.h"
-#include "sys/proc.h"
-#include "sys/systm.h"
-#include "sys/mbuf.h"
-#include "sys/buf.h"
-#include "sys/protosw.h"
-#include "sys/socket.h"
-#include "sys/syslog.h"
-#include "sys/ioctl.h"
-#include "sys/errno.h"
-
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #endif
  
-#include "../include/cpu.h"
-#include "../hp300/isr.h"
-#include "../include/mtpr.h"
-#include "hp/dev/device.h"
-#include "if_lereg.h"
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>
+#include <machine/mtpr.h>
+#include <hp/dev/device.h>
+#include <hp300/dev/if_lereg.h>
  
  #if NBPFILTER > 0
  
  #if NBPFILTER > 0
-#include "../net/bpf.h"
-#include "../net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
  #endif
  
  /* offsets for:           ID,   REGS,    MEM,  NVRAM */
  #endif
  
  /* offsets for:           ID,   REGS,    MEM,  NVRAM */
diff --git a/usr/src/sys/hp300/dev/if_lereg.h b/usr/src/sys/hp300/dev/if_lereg.h

index 2d598b2..f8d7cf7 100644 (file)
--- a/usr/src/sys/hp300/dev/if_lereg.h
+++ b/usr/src/sys/hp300/dev/if_lereg.h
@@ -4,14 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_lereg.h  7.4 (Berkeley) %G%
+ *     @(#)if_lereg.h  7.5 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  #define        LEID            21
  
  
  #define        LEID            21
  
diff --git a/usr/src/sys/hp300/dev/ite_dv.c b/usr/src/sys/hp300/dev/ite_dv.c

index f089a24..b74a251 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_dv.c
+++ b/usr/src/sys/hp300/dev/ite_dv.c
@@ -11,28 +11,28 @@
   *
   * from: Utah $Hdr: ite_dv.c 1.8 92/01/21$
   *
   *
   * from: Utah $Hdr: ite_dv.c 1.8 92/01/21$
   *
- *     @(#)ite_dv.c    7.6 (Berkeley) %G%
+ *     @(#)ite_dv.c    7.7 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
  
  
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "grf_dvreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_dvreg.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX */
  
  /* XXX */
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  #define REGBASE                ((struct dvboxfb *)(ip->regbase))
  #define WINDOWMOVER    dvbox_windowmove
  
  #define REGBASE                ((struct dvboxfb *)(ip->regbase))
  #define WINDOWMOVER    dvbox_windowmove
diff --git a/usr/src/sys/hp300/dev/ite_gb.c b/usr/src/sys/hp300/dev/ite_gb.c

index 5cc3b75..010de42 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_gb.c
+++ b/usr/src/sys/hp300/dev/ite_gb.c
@@ -11,28 +11,28 @@
   *
   * from: Utah $Hdr: ite_gb.c 1.19 92/01/21$
   *
   *
   * from: Utah $Hdr: ite_gb.c 1.19 92/01/21$
   *
- *     @(#)ite_gb.c    7.6 (Berkeley) %G%
+ *     @(#)ite_gb.c    7.7 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
  
  
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "grf_gbreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_gbreg.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX */
  
  /* XXX */
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  #define REGBASE        ((struct gboxfb *)(ip->regbase))
  #define WINDOWMOVER    gbox_windowmove
  
  #define REGBASE        ((struct gboxfb *)(ip->regbase))
  #define WINDOWMOVER    gbox_windowmove
diff --git a/usr/src/sys/hp300/dev/ite_hy.c b/usr/src/sys/hp300/dev/ite_hy.c

index 6607928..198f084 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_hy.c
+++ b/usr/src/sys/hp300/dev/ite_hy.c
@@ -12,29 +12,29 @@
   *
   * from: Utah $Hdr: ite_hy.c 1.1 92/01/22$
   *
   *
   * from: Utah $Hdr: ite_hy.c 1.1 92/01/22$
   *
- *     @(#)ite_hy.c    7.1 (Berkeley) %G%
+ *     @(#)ite_hy.c    7.2 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
-#include "uio.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
  
  
-#include "grf_hyreg.h"
-#include "hp/dev/itereg.h"
-#include "hp/dev/itevar.h"
+#include <hp300/dev/grf_hyreg.h>
+#include <hp/dev/itereg.h>
+#include <hp/dev/itevar.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX */
  
  /* XXX */
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  #define REGBASE                ((struct hyboxfb *)(ip->regbase))
  #define WINDOWMOVER    hyper_windowmove
  
  #define REGBASE                ((struct hyboxfb *)(ip->regbase))
  #define WINDOWMOVER    hyper_windowmove
@@ -190,7 +190,7 @@ hyper_scroll(ip, sy, sx, count, dir)
                          width  * ip->ftwidth, RR_COPY);
  }
  
                          width  * ip->ftwidth, RR_COPY);
  }
  
-#include "maskbits.h"
+#include <hp300/dev/maskbits.h>
  
  /* NOTE:
   * the first element in starttab could be 0xffffffff.  making it 0
  
  /* NOTE:
   * the first element in starttab could be 0xffffffff.  making it 0
diff --git a/usr/src/sys/hp300/dev/ite_rb.c b/usr/src/sys/hp300/dev/ite_rb.c

index ea976c5..0a48c5d 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_rb.c
+++ b/usr/src/sys/hp300/dev/ite_rb.c
@@ -11,28 +11,28 @@
   *
   * from: Utah $Hdr: ite_rb.c 1.17 92/01/21$
   *
   *
   * from: Utah $Hdr: ite_rb.c 1.17 92/01/21$
   *
- *     @(#)ite_rb.c    7.6 (Berkeley) %G%
+ *     @(#)ite_rb.c    7.7 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
  
  
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "grf_rbreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_rbreg.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX */
  
  /* XXX */
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  #define REGBASE                ((struct rboxfb *)(ip->regbase))
  #define WINDOWMOVER    rbox_windowmove
  
  #define REGBASE                ((struct rboxfb *)(ip->regbase))
  #define WINDOWMOVER    rbox_windowmove
diff --git a/usr/src/sys/hp300/dev/ite_tc.c b/usr/src/sys/hp300/dev/ite_tc.c

index 6f2e3e6..059f097 100644 (file)
--- a/usr/src/sys/hp300/dev/ite_tc.c
+++ b/usr/src/sys/hp300/dev/ite_tc.c
@@ -11,29 +11,29 @@
   *
   * from: Utah $Hdr: ite_tc.c 1.26 92/01/21$
   *
   *
   * from: Utah $Hdr: ite_tc.c 1.26 92/01/21$
   *
- *     @(#)ite_tc.c    7.5 (Berkeley) %G%
+ *     @(#)ite_tc.c    7.6 (Berkeley) %G%
   */
  
  #include "ite.h"
  #if NITE > 0
  
   */
  
  #include "ite.h"
  #if NITE > 0
  
-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
  
  
-#include "grf_tcreg.h"
-#include "hp/dev/grfreg.h"
-#include "hp/dev/itereg.h"
-#include "hp/dev/itevar.h"
+#include <hp300/dev/grf_tcreg.h>
+#include <hp/dev/grfreg.h>
+#include <hp/dev/itereg.h>
+#include <hp/dev/itevar.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX */
  
  /* XXX */
-#include "hp/dev/grfioctl.h"
-#include "hp/dev/grfvar.h"
+#include <hp/dev/grfioctl.h>
+#include <hp/dev/grfvar.h>
  
  #define REGBASE                ((struct tcboxfb *)(ip->regbase))
  #define WINDOWMOVER    topcat_windowmove
  
  #define REGBASE                ((struct tcboxfb *)(ip->regbase))
  #define WINDOWMOVER    topcat_windowmove
diff --git a/usr/src/sys/hp300/dev/nhpib.c b/usr/src/sys/hp300/dev/nhpib.c

index d9aa560..0528706 100644 (file)
--- a/usr/src/sys/hp300/dev/nhpib.c
+++ b/usr/src/sys/hp300/dev/nhpib.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)nhpib.c     7.6 (Berkeley) %G%
+ *     @(#)nhpib.c     7.7 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,14 +13,14 @@
  #include "hpib.h"
  #if NHPIB > 0
  
  #include "hpib.h"
  #if NHPIB > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
  
  
-#include "hp/dev/device.h"
-#include "nhpibreg.h"
-#include "hpibvar.h"
-#include "dmavar.h"
+#include <hp/dev/device.h>
+#include <hp300/dev/nhpibreg.h>
+#include <hp300/dev/hpibvar.h>
+#include <hp300/dev/dmavar.h>
  
  nhpibtype(hc)
         register struct hp_ctlr *hc;
  
  nhpibtype(hc)
         register struct hp_ctlr *hc;
diff --git a/usr/src/sys/hp300/dev/nhpibreg.h b/usr/src/sys/hp300/dev/nhpibreg.h

index e60514a..0587ad0 100644 (file)
--- a/usr/src/sys/hp300/dev/nhpibreg.h
+++ b/usr/src/sys/hp300/dev/nhpibreg.h
@@ -4,14 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)nhpibreg.h  7.2 (Berkeley) %G%
+ *     @(#)nhpibreg.h  7.3 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "hp/dev/iotypes.h"    /* XXX */
-#else
  #include <hp/dev/iotypes.h>    /* XXX */
  #include <hp/dev/iotypes.h>    /* XXX */
-#endif
  
  struct nhpibdevice {
         u_char  hpib_pad0;
  
  struct nhpibdevice {
         u_char  hpib_pad0;
diff --git a/usr/src/sys/hp300/dev/ppi.c b/usr/src/sys/hp300/dev/ppi.c

index 94bb2ed..b1dc789 100644 (file)
--- a/usr/src/sys/hp300/dev/ppi.c
+++ b/usr/src/sys/hp300/dev/ppi.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)ppi.c       7.5 (Berkeley) %G%
+ *     @(#)ppi.c       7.6 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -14,14 +14,14 @@
  #include "ppi.h"
  #if NPPI > 0
  
  #include "ppi.h"
  #if NPPI > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/errno.h"
-#include "sys/uio.h"
-#include "sys/malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
  
  
-#include "hp/dev/device.h"
-#include "ppiioctl.h"
+#include <hp/dev/device.h>
+#include <hp300/dev/ppiioctl.h>
  
  int    ppiattach(), ppistart(), ppitimo();
  struct driver ppidriver = {
  
  int    ppiattach(), ppistart(), ppitimo();
  struct driver ppidriver = {
diff --git a/usr/src/sys/hp300/dev/ppiioctl.h b/usr/src/sys/hp300/dev/ppiioctl.h

index 69658bd..eb6c2ab 100644 (file)
--- a/usr/src/sys/hp300/dev/ppiioctl.h
+++ b/usr/src/sys/hp300/dev/ppiioctl.h
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)ppiioctl.h  7.2 (Berkeley) %G%
+ *     @(#)ppiioctl.h  7.3 (Berkeley) %G%
   */
  
  #ifndef _IOCTL_
   */
  
  #ifndef _IOCTL_
diff --git a/usr/src/sys/hp300/dev/rd.c b/usr/src/sys/hp300/dev/rd.c

index e067268..9bb47d9 100644 (file)
--- a/usr/src/sys/hp300/dev/rd.c
+++ b/usr/src/sys/hp300/dev/rd.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: rd.c 1.38 90/10/12$
   *
   *
   * from: Utah $Hdr: rd.c 1.38 90/10/12$
   *
- *     @(#)rd.c        7.16 (Berkeley) %G%
+ *     @(#)rd.c        7.17 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,21 +20,21 @@
  #include "rd.h"
  #if NRD > 0
  
  #include "rd.h"
  #if NRD > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/errno.h"
-#include "sys/dkstat.h"
-#include "sys/disklabel.h"
-#include "sys/buf.h"
-#include "sys/uio.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/dkstat.h>
+#include <sys/disklabel.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
  
  
-#include "hp/dev/device.h"
-#include "rdreg.h"
+#include <hp/dev/device.h>
+#include <hp300/dev/rdreg.h>
  
  
-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
  
  int    rdinit(), rdstart(), rdgo(), rdintr();
  struct driver rddriver = {
  
  int    rdinit(), rdstart(), rdgo(), rdintr();
  struct driver rddriver = {
diff --git a/usr/src/sys/hp300/dev/scsi.c b/usr/src/sys/hp300/dev/scsi.c

index 74110c0..dc7c91f 100644 (file)
--- a/usr/src/sys/hp300/dev/scsi.c
+++ b/usr/src/sys/hp300/dev/scsi.c
@@ -10,7 +10,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)scsi.c      7.7 (Berkeley) %G%
+ *     @(#)scsi.c      7.8 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -23,17 +23,18 @@
  static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/scsi.c,v 1.2 92/04/10 20:48:29 mike Exp $";
  #endif
  
  static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/scsi.c,v 1.2 92/04/10 20:48:29 mike Exp $";
  #endif
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "hp/dev/device.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
  
  
-#include "scsivar.h"
-#include "scsireg.h"
-#include "dmavar.h"
+#include <hp/dev/device.h>
  
  
-#include "../include/cpu.h"
-#include "../hp300/isr.h"
+#include <hp300/dev/scsivar.h>
+#include <hp300/dev/scsireg.h>
+#include <hp300/dev/dmavar.h>
+
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>
  
  /*
   * SCSI delays
  
  /*
   * SCSI delays
diff --git a/usr/src/sys/hp300/dev/sd.c b/usr/src/sys/hp300/dev/sd.c

index f2a3298..693203e 100644 (file)
--- a/usr/src/sys/hp300/dev/sd.c
+++ b/usr/src/sys/hp300/dev/sd.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sd.c        7.15 (Berkeley) %G%
+ *     @(#)sd.c        7.16 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,21 +20,22 @@
  static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/sd.c,v 1.2 92/04/10 20:48:35 mike Exp $";
  #endif
  
  static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/sd.c,v 1.2 92/04/10 20:48:35 mike Exp $";
  #endif
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/dkstat.h"
-#include "sys/disklabel.h"
-#include "sys/malloc.h"
-#include "sys/proc.h"
-#include "sys/ioctl.h"
-
-#include "hp/dev/device.h"
-#include "scsireg.h"
-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/disklabel.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+
+#include <hp/dev/device.h>
+#include <hp300/dev/scsireg.h>
+
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
diff --git a/usr/src/sys/hp300/dev/st.c b/usr/src/sys/hp300/dev/st.c

index 3f159a7..7ff55ba 100644 (file)
--- a/usr/src/sys/hp300/dev/st.c
+++ b/usr/src/sys/hp300/dev/st.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: st.c 1.11 92/01/21$
   *
   *
   * from: Utah $Hdr: st.c 1.11 92/01/21$
   *
- *      @(#)st.c       7.8 (Berkeley) %G%
+ *      @(#)st.c       7.9 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -49,20 +49,20 @@
  #include "st.h"
  #if NST > 0
  
  #include "st.h"
  #if NST > 0
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "file.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "mtio.h"
-#include "kernel.h"
-#include "tprintf.h"
-
-#include "hp/dev/device.h"
-#include "scsireg.h"
-#include "stvar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/mtio.h>
+#include <sys/kernel.h>
+#include <sys/tprintf.h>
+
+#include <hp/dev/device.h>
+#include <hp300/dev/scsireg.h>
+#include <hp300/dev/stvar.h>
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
diff --git a/usr/src/sys/hp300/hp300/autoconf.c b/usr/src/sys/hp300/hp300/autoconf.c

index 7b38e5f..67fe18b 100644 (file)
--- a/usr/src/sys/hp300/hp300/autoconf.c
+++ b/usr/src/sys/hp300/hp300/autoconf.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: autoconf.c 1.35 92/01/22$
   *
   *
   * from: Utah $Hdr: autoconf.c 1.35 92/01/22$
   *
- *     @(#)autoconf.c  7.7 (Berkeley) %G%
+ *     @(#)autoconf.c  7.8 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,22 +22,22 @@
   * and the drivers are initialized.
   */
  
   * and the drivers are initialized.
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/map.h"
-#include "sys/buf.h"
-#include "sys/dkstat.h"
-#include "sys/conf.h"
-#include "sys/dmap.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/conf.h>
+#include <sys/dmap.h>
+#include <sys/reboot.h>
  
  
-#include "../include/vmparam.h"
-#include "../include/cpu.h"
-#include "pte.h"
-#include "isr.h"
-#include "hp/dev/device.h"
-#include "hp/dev/grfreg.h"
-#include "hp/dev/hilreg.h"
+#include <machine/vmparam.h>
+#include <machine/cpu.h>
+#include <hp300/hp300/pte.h>
+#include <hp300/hp300/isr.h>
+#include <hp/dev/device.h>
+#include <hp/dev/grfreg.h>
+#include <hp/dev/hilreg.h>
  
  /*
   * The following several variables are related to
  
  /*
   * The following several variables are related to
@@ -869,7 +869,7 @@ iounmap(kva, size)
  }
  
  #if NCD > 0
  }
  
  #if NCD > 0
-#include "dev/cdvar.h"
+#include <dev/cdvar.h>
  
  find_cdevices()
  {
  
  find_cdevices()
  {
diff --git a/usr/src/sys/hp300/hp300/clock.c b/usr/src/sys/hp300/hp300/clock.c

index a67cd30..ecb3398 100644 (file)
--- a/usr/src/sys/hp300/hp300/clock.c
+++ b/usr/src/sys/hp300/hp300/clock.c
@@ -11,19 +11,19 @@
   *
   * from: Utah $Hdr: clock.c 1.18 91/01/21$
   *
   *
   * from: Utah $Hdr: clock.c 1.18 91/01/21$
   *
- *     @(#)clock.c     7.15 (Berkeley) %G%
+ *     @(#)clock.c     7.16 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "kernel.h"
-#include "hp/dev/hilreg.h"
-#include "clockreg.h"
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <hp/dev/hilreg.h>
+#include <hp300/hp300/clockreg.h>
  
  
-#include "../include/psl.h"
-#include "../include/cpu.h"
+#include <machine/psl.h>
+#include <machine/cpu.h>
  
  #ifdef GPROF
  
  #ifdef GPROF
-#include "sys/gmon.h"
+#include <sys/gmon.h>
  #endif
  
  int    clkstd[1];
  #endif
  
  int    clkstd[1];
diff --git a/usr/src/sys/hp300/hp300/conf.c b/usr/src/sys/hp300/hp300/conf.c

index fb4dd7d..536093f 100644 (file)
--- a/usr/src/sys/hp300/hp300/conf.c
+++ b/usr/src/sys/hp300/hp300/conf.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *      @(#)conf.c     7.13 (Berkeley) %G%
+ *      @(#)conf.c     7.14 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/proc.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
diff --git a/usr/src/sys/hp300/hp300/dkbad.c b/usr/src/sys/hp300/hp300/dkbad.c

index dde19bd..8b9078c 100644 (file)
--- a/usr/src/sys/hp300/hp300/dkbad.c
+++ b/usr/src/sys/hp300/hp300/dkbad.c
@@ -4,13 +4,13 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dkbad.c     7.2 (Berkeley) %G%
+ *     @(#)dkbad.c     7.3 (Berkeley) %G%
   */
  
  #ifndef NOBADSECT
   */
  
  #ifndef NOBADSECT
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/dkbad.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/dkbad.h>
  
  /*
   * Search the bad sector table looking for
  
  /*
   * Search the bad sector table looking for
diff --git a/usr/src/sys/hp300/hp300/genassym.c b/usr/src/sys/hp300/hp300/genassym.c

index a37b9f5..cded88c 100644 (file)
--- a/usr/src/sys/hp300/hp300/genassym.c
+++ b/usr/src/sys/hp300/hp300/genassym.c
@@ -4,26 +4,28 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)genassym.c  7.11 (Berkeley) %G%
+ *     @(#)genassym.c  7.12 (Berkeley) %G%
   */
  
  #define KERNEL
  
   */
  
  #define KERNEL
  
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/map.h"
-#include "sys/proc.h"
-#include "sys/mbuf.h"
-#include "sys/msgbuf.h"
-#include "../include/cpu.h"
-#include "../include/trap.h"
-#include "../include/psl.h"
-#include "../include/reg.h"
-#include "clockreg.h"
-#include "sys/syscall.h"
-#include "vm/vm.h"
-#include "sys/user.h"
-#include "pte.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/syscall.h>
+#include <sys/user.h>
+
+#include <machine/cpu.h>
+#include <machine/trap.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+
+#include <hp300/hp300/clockreg.h>
+#include <vm/vm.h>
+#include <hp300/hp300/pte.h>
  
  #include <errno.h>
  #include <stdio.h>
  
  #include <errno.h>
  #include <stdio.h>
diff --git a/usr/src/sys/hp300/hp300/in_cksum.c b/usr/src/sys/hp300/hp300/in_cksum.c

index b2bcae3..79d75b4 100644 (file)
--- a/usr/src/sys/hp300/hp300/in_cksum.c
+++ b/usr/src/sys/hp300/hp300/in_cksum.c
@@ -6,17 +6,18 @@
   *
   * from: Utah $Hdr: in_cksum.c 1.1 90/07/09$
   *
   *
   * from: Utah $Hdr: in_cksum.c 1.1 90/07/09$
   *
- *     @(#)in_cksum.c  7.3 (Berkeley) %G%
+ *     @(#)in_cksum.c  7.4 (Berkeley) %G%
   */
  
  /*
   * in_cksum - checksum routine for the Internet Protocol family.
   */
  
   */
  
  /*
   * in_cksum - checksum routine for the Internet Protocol family.
   */
  
-#include "sys/param.h"
-#include "sys/mbuf.h"
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
+#include <sys/param.h>
+#include <sys/mbuf.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
  
  extern int oc_cksum();
  
  
  extern int oc_cksum();
  
diff --git a/usr/src/sys/hp300/hp300/kgdb_glue.c b/usr/src/sys/hp300/hp300/kgdb_glue.c

index ec2f10e..08da1d0 100644 (file)
--- a/usr/src/sys/hp300/hp300/kgdb_glue.c
+++ b/usr/src/sys/hp300/hp300/kgdb_glue.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kgdb_glue.c 7.1 (Berkeley) %G%
+ *     @(#)kgdb_glue.c 7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,9 +13,10 @@
  
  #ifdef KGDB
  
  
  #ifdef KGDB
  
-#include "param.h"
-#include "../include/frame.h"
-#include "../include/reg.h"
+#include <sys/param.h>
+
+#include <machine/frame.h>
+#include <machine/reg.h>
  
  #ifndef lint
  static char rcsid[] =
  
  #ifndef lint
  static char rcsid[] =
diff --git a/usr/src/sys/hp300/hp300/kgdb_stub.c b/usr/src/sys/hp300/hp300/kgdb_stub.c

index 35ed957..a1ab816 100644 (file)
--- a/usr/src/sys/hp300/hp300/kgdb_stub.c
+++ b/usr/src/sys/hp300/hp300/kgdb_stub.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kgdb_stub.c 7.13 (Berkeley) %G%
+ *     @(#)kgdb_stub.c 7.14 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,18 +18,20 @@
  static char rcsid[] = "$Header: kgdb_stub.c,v 1.2 92/07/23 19:37:50 mccanne Exp $";
  #endif
  
  static char rcsid[] = "$Header: kgdb_stub.c,v 1.2 92/07/23 19:37:50 mccanne Exp $";
  #endif
  
-#include "param.h"
-#include "systm.h"
-#include "../include/trap.h"
-#include "../include/cpu.h"
-#include "../include/psl.h"
-#include "../include/reg.h"
-#include "../include/frame.h"
-#include "buf.h"
-#include "hp/dev/cons.h"
-
-#include "kgdb_proto.h"
-#include "machine/remote-sl.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <machine/trap.h>
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <machine/frame.h>
+
+#include <sys/buf.h>
+#include <hp/dev/cons.h>
+
+#include <hp300/hp300/kgdb_proto.h>
+#include <machine/remote-sl.h>
  
  extern int kernacc();
  extern void chgkprot();
  
  extern int kernacc();
  extern void chgkprot();
diff --git a/usr/src/sys/hp300/hp300/locore.s b/usr/src/sys/hp300/hp300/locore.s

index bc545ba..129609e 100644 (file)
--- a/usr/src/sys/hp300/hp300/locore.s
+++ b/usr/src/sys/hp300/hp300/locore.s
@@ -11,11 +11,11 @@
   *
   * from: Utah $Hdr: locore.s 1.62 92/01/20$
   *
   *
   * from: Utah $Hdr: locore.s 1.62 92/01/20$
   *
- *     @(#)locore.s    7.17 (Berkeley) %G%
+ *     @(#)locore.s    7.18 (Berkeley) %G%
   */
  
  #include "assym.s"
   */
  
  #include "assym.s"
-#include "vectors.s"
+#include <hp300/hp300/vectors.s>
  
  #define MMUADDR(ar)    movl    _MMUbase,ar
  #define CLKADDR(ar)    movl    _CLKbase,ar
  
  #define MMUADDR(ar)    movl    _MMUbase,ar
  #define CLKADDR(ar)    movl    _CLKbase,ar
diff --git a/usr/src/sys/hp300/hp300/machdep.c b/usr/src/sys/hp300/hp300/machdep.c

index 8a5e659..154c3c3 100644 (file)
--- a/usr/src/sys/hp300/hp300/machdep.c
+++ b/usr/src/sys/hp300/hp300/machdep.c
@@ -11,43 +11,43 @@
   *
   * from: Utah $Hdr: machdep.c 1.68 92/01/20$
   *
   *
   * from: Utah $Hdr: machdep.c 1.68 92/01/20$
   *
- *     @(#)machdep.c   7.32 (Berkeley) %G%
+ *     @(#)machdep.c   7.33 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "signalvar.h"
-#include "kernel.h"
-#include "map.h"
-#include "proc.h"
-#include "buf.h"
-#include "reboot.h"
-#include "conf.h"
-#include "file.h"
-#include "clist.h"
-#include "callout.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "msgbuf.h"
-#include "mount.h"
-#include "user.h"
-#include "exec.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/reboot.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/clist.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/mount.h>
+#include <sys/user.h>
+#include <sys/exec.h>
  #ifdef SYSVSHM
  #ifdef SYSVSHM
-#include "shm.h"
+#include <sys/shm.h>
  #endif
  #ifdef HPUXCOMPAT
  #endif
  #ifdef HPUXCOMPAT
-#include "hp/hpux/hpux.h"
+#include <hp/hpux/hpux.h>
  #endif
  
  #endif
  
-#include "../include/cpu.h"
-#include "../include/reg.h"
-#include "../include/psl.h"
-#include "isr.h"
-#include "pte.h"
-#include "net/netisr.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <hp300/hp300/isr.h>
+#include <hp300/hp300/pte.h>
+#include <net/netisr.h>
  
  #define        MAXMEM  64*1024*CLSIZE  /* XXX - from cmap.h */
  
  #define        MAXMEM  64*1024*CLSIZE  /* XXX - from cmap.h */
-#include "vm/vm_kern.h"
+#include <vm/vm_kern.h>
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
diff --git a/usr/src/sys/hp300/hp300/mem.c b/usr/src/sys/hp300/hp300/mem.c

index cf4872f..41fcfb8 100644 (file)
--- a/usr/src/sys/hp300/hp300/mem.c
+++ b/usr/src/sys/hp300/hp300/mem.c
@@ -11,25 +11,25 @@
   *
   * from: Utah $Hdr: mem.c 1.14 90/10/12$
   *
   *
   * from: Utah $Hdr: mem.c 1.14 90/10/12$
   *
- *     @(#)mem.c       7.10 (Berkeley) %G%
+ *     @(#)mem.c       7.11 (Berkeley) %G%
   */
  
  /*
   * Memory special file
   */
  
   */
  
  /*
   * Memory special file
   */
  
-#include "param.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
  
  /*ARGSUSED*/
  mmrw(dev, uio, flags)
  
  /*ARGSUSED*/
  mmrw(dev, uio, flags)
diff --git a/usr/src/sys/hp300/hp300/pmap.c b/usr/src/sys/hp300/hp300/pmap.c

index e51cd56..98ac704 100644 (file)
--- a/usr/src/sys/hp300/hp300/pmap.c
+++ b/usr/src/sys/hp300/hp300/pmap.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pmap.c      7.13 (Berkeley) %G%
+ *     @(#)pmap.c      7.14 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -50,19 +50,19 @@
   *     and to when physical maps must be made correct.
   */
  
   *     and to when physical maps must be made correct.
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/user.h>
  
  
-#include "pte.h"
+#include <hp300/hp300/pte.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  #ifdef DEBUG
  struct {
  
  #ifdef DEBUG
  struct {
diff --git a/usr/src/sys/hp300/hp300/pmap_bootstrap.c b/usr/src/sys/hp300/hp300/pmap_bootstrap.c

index 8e5cac7..c9f5b5b 100644 (file)
--- a/usr/src/sys/hp300/hp300/pmap_bootstrap.c
+++ b/usr/src/sys/hp300/hp300/pmap_bootstrap.c
@@ -8,16 +8,18 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pmap_bootstrap.c    7.2 (Berkeley) %G%
+ *     @(#)pmap_bootstrap.c    7.3 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "pte.h"
-#include "clockreg.h"
-#include "../include/vmparam.h"
-#include "../include/cpu.h"
+#include <sys/param.h>
  
  
-#include "vm/vm.h"
+#include <hp300/hp300/pte.h>
+#include <hp300/hp300/clockreg.h>
+
+#include <machine/vmparam.h>
+#include <machine/cpu.h>
+
+#include <vm/vm.h>
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
@@ -43,7 +45,7 @@ extern int hppagesperpage;
  #endif
  
  #if BSDVM_COMPAT
  #endif
  
  #if BSDVM_COMPAT
-#include "msgbuf.h"
+#include <sys/msgbuf.h>
  
  /*
   * All those kernel PT submaps that BSD is so fond of
  
  /*
   * All those kernel PT submaps that BSD is so fond of
diff --git a/usr/src/sys/hp300/hp300/swapgeneric.c b/usr/src/sys/hp300/hp300/swapgeneric.c

index a3bb6b3..1aed3cd 100644 (file)
--- a/usr/src/sys/hp300/hp300/swapgeneric.c
+++ b/usr/src/sys/hp300/hp300/swapgeneric.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)swapgeneric.c       7.7 (Berkeley) %G%
+ *     @(#)swapgeneric.c       7.8 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/conf.h"
-#include "sys/buf.h"
-#include "sys/systm.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/reboot.h>
  
  
-#include "hp/dev/device.h"
+#include <hp/dev/device.h>
  
  /*
   * Generic configuration;  all in one
  
  /*
   * Generic configuration;  all in one
diff --git a/usr/src/sys/hp300/hp300/sys_machdep.c b/usr/src/sys/hp300/hp300/sys_machdep.c

index b1b7d0b..fe54a76 100644 (file)
--- a/usr/src/sys/hp300/hp300/sys_machdep.c
+++ b/usr/src/sys/hp300/hp300/sys_machdep.c
@@ -4,21 +4,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sys_machdep.c       7.9 (Berkeley) %G%
+ *     @(#)sys_machdep.c       7.10 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/file.h"
-#include "sys/time.h"
-#include "sys/proc.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/mtio.h"
-#include "sys/buf.h"
-#include "sys/trace.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/mtio.h>
+#include <sys/buf.h>
+#include <sys/trace.h>
+
+#include <vm/vm.h>
  
  #ifdef TRACE
  int    nvualarm;
  
  #ifdef TRACE
  int    nvualarm;
@@ -76,7 +77,7 @@ vdoualarm(arg)
  }
  #endif
  
  }
  #endif
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX should be in an include file somewhere */
  #define CC_PURGE       1
  
  /* XXX should be in an include file somewhere */
  #define CC_PURGE       1
diff --git a/usr/src/sys/hp300/hp300/trap.c b/usr/src/sys/hp300/hp300/trap.c

index 9d85ead..0146102 100644 (file)
--- a/usr/src/sys/hp300/hp300/trap.c
+++ b/usr/src/sys/hp300/hp300/trap.c
@@ -11,34 +11,34 @@
   *
   * from: Utah $Hdr: trap.c 1.35 91/12/26$
   *
   *
   * from: Utah $Hdr: trap.c 1.35 91/12/26$
   *
- *     @(#)trap.c      7.24 (Berkeley) %G%
+ *     @(#)trap.c      7.25 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "acct.h"
-#include "kernel.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "syscall.h"
-#include "syslog.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/acct.h>
+#include <sys/kernel.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/syscall.h>
+#include <sys/syslog.h>
+#include <sys/user.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  #endif
  
-#include "../include/psl.h"
-#include "../include/trap.h"
-#include "../include/cpu.h"
-#include "../include/reg.h"
-#include "../include/mtpr.h"
+#include <machine/psl.h>
+#include <machine/trap.h>
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/mtpr.h>
  
  
-#include "vm/vm.h"
-#include "vm/pmap.h"
+#include <vm/vm.h>
+#include <vm/pmap.h>
  
  #ifdef HPUXCOMPAT
  
  #ifdef HPUXCOMPAT
-#include "hp/hpux/hpux.h"
+#include <hp/hpux/hpux.h>
  #endif
  
  struct sysent  sysent[];
  #endif
  
  struct sysent  sysent[];
diff --git a/usr/src/sys/hp300/hp300/vm_machdep.c b/usr/src/sys/hp300/hp300/vm_machdep.c

index a406c4f..021f2ef 100644 (file)
--- a/usr/src/sys/hp300/hp300/vm_machdep.c
+++ b/usr/src/sys/hp300/hp300/vm_machdep.c
@@ -11,22 +11,22 @@
   *
   * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
   *
   *
   * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
   *
- *     @(#)vm_machdep.c        7.12 (Berkeley) %G%
+ *     @(#)vm_machdep.c        7.13 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "buf.h"
-#include "vnode.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/user.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "pte.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <hp300/hp300/pte.h>
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
diff --git a/usr/src/sys/hp300/stand/Makefile b/usr/src/sys/hp300/stand/Makefile

index 8a87990..f580421 100644 (file)
--- a/usr/src/sys/hp300/stand/Makefile
+++ b/usr/src/sys/hp300/stand/Makefile
@@ -1,9 +1,8 @@
-#      @(#)Makefile    7.15 (Berkeley) %G%
+#      @(#)Makefile    7.16 (Berkeley) %G%
  
  DESTDIR=
  
  DESTDIR=
-STAND= ../../stand
-INCPATH=-I. -I${STAND} -I../.. -I../../sys -I..
-VPATH= ${STAND}
+INCPATH=-I../..
+VPATH= ../../stand
  
  CC=cc
  AS=as
  
  CC=cc
  AS=as
diff --git a/usr/src/sys/hp300/stand/autoconf.c b/usr/src/sys/hp300/stand/autoconf.c

index e588d47..db4dac1 100644 (file)
--- a/usr/src/sys/hp300/stand/autoconf.c
+++ b/usr/src/sys/hp300/stand/autoconf.c
@@ -11,16 +11,16 @@
   *
   * from: Utah $Hdr: autoconf.c 1.16 92/05/29$
   *
   *
   * from: Utah $Hdr: autoconf.c 1.16 92/05/29$
   *
- *     @(#)autoconf.c  7.6 (Berkeley) %G%
+ *     @(#)autoconf.c  7.7 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
-#include "rominfo.h"
-#include "sys/param.h"
-#include "sys/reboot.h"
+#include <hp300/stand/samachdep.h>
+#include <hp300/stand/rominfo.h>
+#include <sys/param.h>
+#include <sys/reboot.h>
  
  
-#include "hp/dev/device.h"
-#include "hp/dev/grfreg.h"
+#include <hp/dev/device.h>
+#include <hp/dev/grfreg.h>
  
  /*
   * Mapping of ROM MSUS types to BSD major device numbers
  
  /*
   * Mapping of ROM MSUS types to BSD major device numbers
diff --git a/usr/src/sys/hp300/stand/boot.c b/usr/src/sys/hp300/stand/boot.c

index 2fb2ba9..318cae7 100644 (file)
--- a/usr/src/sys/hp300/stand/boot.c
+++ b/usr/src/sys/hp300/stand/boot.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)boot.c      7.5 (Berkeley) %G%
+ *     @(#)boot.c      7.6 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
  #include <a.out.h>
  #include <a.out.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  #ifndef INSECURE
  
  #ifndef INSECURE
-#include "sys/stat.h"
+#include <sys/stat.h>
  struct stat sb;
  #endif
  
  struct stat sb;
  #endif
  
@@ -33,7 +33,7 @@ extern        int noconsole;
  extern int howto, bootdev;
  
  #ifdef PRTCPU
  extern int howto, bootdev;
  
  #ifdef PRTCPU
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  #endif
  
  main()
  #endif
  
  main()
diff --git a/usr/src/sys/hp300/stand/conf.c b/usr/src/sys/hp300/stand/conf.c

index 304a5a1..d3d4375 100644 (file)
--- a/usr/src/sys/hp300/stand/conf.c
+++ b/usr/src/sys/hp300/stand/conf.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)conf.c      7.4 (Berkeley) %G%
+ *     @(#)conf.c      7.5 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "saio.h"
+#include <sys/param.h>
+#include <stand/saio.h>
  
  extern int     nullsys(), nodev(), noioctl();
  
  
  extern int     nullsys(), nodev(), noioctl();
  
diff --git a/usr/src/sys/hp300/stand/cons.c b/usr/src/sys/hp300/stand/cons.c

index 4190202..25391ea 100644 (file)
--- a/usr/src/sys/hp300/stand/cons.c
+++ b/usr/src/sys/hp300/stand/cons.c
@@ -11,12 +11,12 @@
   *
   * from: Utah $Hdr: cons.c 1.7 92/02/28$
   *
   *
   * from: Utah $Hdr: cons.c 1.7 92/02/28$
   *
- *     @(#)cons.c      7.5 (Berkeley) %G%
+ *     @(#)cons.c      7.6 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "samachdep.h"
-#include "../hp/dev/cons.h"
+#include <sys/param.h>
+#include <hp300/stand/samachdep.h>
+#include <hp/dev/cons.h>
  
  #ifdef ITECONSOLE
  int    iteprobe(), iteinit(), itegetchar(), iteputchar();
  
  #ifdef ITECONSOLE
  int    iteprobe(), iteinit(), itegetchar(), iteputchar();
diff --git a/usr/src/sys/hp300/stand/ct.c b/usr/src/sys/hp300/stand/ct.c

index 273b9ab..243b8c3 100644 (file)
--- a/usr/src/sys/hp300/stand/ct.c
+++ b/usr/src/sys/hp300/stand/ct.c
@@ -4,17 +4,18 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)ct.c        7.5 (Berkeley) %G%
+ *     @(#)ct.c        7.6 (Berkeley) %G%
   */
  
  /*
   * CS80 tape driver
   */
   */
  
  /*
   * CS80 tape driver
   */
-#include "sys/param.h"
-#include "../dev/ctreg.h"
+#include <sys/param.h>
  
  
-#include "saio.h"
-#include "samachdep.h"
+#include <hp300/dev/ctreg.h>
+
+#include <stand/saio.h>
+#include <hp300/stand/samachdep.h>
  
  struct ct_iocmd ct_ioc;
  struct ct_rscmd ct_rsc;
  
  struct ct_iocmd ct_ioc;
  struct ct_rscmd ct_rsc;
diff --git a/usr/src/sys/hp300/stand/dca.c b/usr/src/sys/hp300/stand/dca.c

index c340eb5..0c993a2 100644 (file)
--- a/usr/src/sys/hp300/stand/dca.c
+++ b/usr/src/sys/hp300/stand/dca.c
@@ -9,14 +9,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dca.c       7.4 (Berkeley) %G%
+ *     @(#)dca.c       7.5 (Berkeley) %G%
   */
  
  #ifdef DCACONSOLE
   */
  
  #ifdef DCACONSOLE
-#include "sys/param.h"
-#include "hp/dev/dcareg.h"
-#include "../include/cpu.h"
-#include "hp/dev/cons.h"
+#include <sys/param.h>
+#include <hp/dev/dcareg.h>
+#include <machine/cpu.h>
+#include <hp/dev/cons.h>
  
  struct dcadevice *dcacnaddr = 0;
  
  
  struct dcadevice *dcacnaddr = 0;
  
diff --git a/usr/src/sys/hp300/stand/dcm.c b/usr/src/sys/hp300/stand/dcm.c

index 829ff85..9c93272 100644 (file)
--- a/usr/src/sys/hp300/stand/dcm.c
+++ b/usr/src/sys/hp300/stand/dcm.c
@@ -9,14 +9,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dcm.c       7.4 (Berkeley) %G%
+ *     @(#)dcm.c       7.5 (Berkeley) %G%
   */
  
  #ifdef DCMCONSOLE
   */
  
  #ifdef DCMCONSOLE
-#include "sys/param.h"
-#include "hp/dev/cons.h"
-#include "hp/dev/device.h"
-#include "../dev/dcmreg.h"
+#include <sys/param.h>
+#include <hp/dev/cons.h>
+#include <hp/dev/device.h>
+#include <hp300/dev/dcmreg.h>
  
  struct dcmdevice *dcmcnaddr = NULL;
  
  
  struct dcmdevice *dcmcnaddr = NULL;
  
diff --git a/usr/src/sys/hp300/stand/fhpib.c b/usr/src/sys/hp300/stand/fhpib.c

index 0c1a782..7eef5c8 100644 (file)
--- a/usr/src/sys/hp300/stand/fhpib.c
+++ b/usr/src/sys/hp300/stand/fhpib.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fhpib.c     7.2 (Berkeley) %G%
+ *     @(#)fhpib.c     7.3 (Berkeley) %G%
   */
  
  /*
   * 98625A/B HPIB driver
   */
  
   */
  
  /*
   * 98625A/B HPIB driver
   */
  
-#include "sys/param.h"
-#include "../dev/fhpibreg.h"
-#include "hpibvar.h"
+#include <sys/param.h>
+#include <hp300/dev/fhpibreg.h>
+#include <hp300/stand/hpibvar.h>
  
  fhpibinit(unit)
         register int unit;
  
  fhpibinit(unit)
         register int unit;
diff --git a/usr/src/sys/hp300/stand/hil.c b/usr/src/sys/hp300/stand/hil.c

index 49e5819..27ee99a 100644 (file)
--- a/usr/src/sys/hp300/stand/hil.c
+++ b/usr/src/sys/hp300/stand/hil.c
@@ -11,20 +11,20 @@
   *
   * from: Utah $Hdr: hil.c 1.1 89/08/22$
   *
   *
   * from: Utah $Hdr: hil.c 1.1 89/08/22$
   *
- *     @(#)hil.c       7.3 (Berkeley) %G%
+ *     @(#)hil.c       7.4 (Berkeley) %G%
   */
  
  /*
   * Keyboard routines for the standalone ITE.
   */
   */
  
  /*
   * Keyboard routines for the standalone ITE.
   */
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/hilreg.h"
-#include "hp/dev/kbdmap.h"
-#include "hp/dev/itevar.h"
+#include <sys/param.h>
+#include <hp/dev/hilreg.h>
+#include <hp/dev/kbdmap.h>
+#include <hp/dev/itevar.h>
  
  #ifndef SMALL
  
  
  #ifndef SMALL
  
diff --git a/usr/src/sys/hp300/stand/hpib.c b/usr/src/sys/hp300/stand/hpib.c

index a1f5b36..baac535 100644 (file)
--- a/usr/src/sys/hp300/stand/hpib.c
+++ b/usr/src/sys/hp300/stand/hpib.c
@@ -4,19 +4,19 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)hpib.c      7.6 (Berkeley) %G%
+ *     @(#)hpib.c      7.7 (Berkeley) %G%
   */
  
  /*
   * HPIB driver
   */
   */
  
  /*
   * HPIB driver
   */
-#include "sys/param.h"
-#include "sys/reboot.h"
-#include "hp/dev/device.h"
-#include "hpibvar.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <hp/dev/device.h>
+#include <hp300/stand/hpibvar.h>
  
  
-#include "saio.h"
-#include "samachdep.h"
+#include <stand/saio.h>
+#include <hp300/stand/samachdep.h>
  
  int    internalhpib = IIOV(0x478000);
  int    fhpibppoll(), nhpibppoll();
  
  int    internalhpib = IIOV(0x478000);
  int    fhpibppoll(), nhpibppoll();
diff --git a/usr/src/sys/hp300/stand/installboot.c b/usr/src/sys/hp300/stand/installboot.c

index 0586b75..cadf8dd 100644 (file)
--- a/usr/src/sys/hp300/stand/installboot.c
+++ b/usr/src/sys/hp300/stand/installboot.c
@@ -1,24 +1,22 @@
-/*
- * Copyright (c) 1980, 1986, 1990 The Regents of the University of California.
+/*-
+ * Copyright (c) 1986, 1990 The Regents of the University of California.
   * All rights reserved.
   *
   * %sccs.include.redist.c%
   * All rights reserved.
   *
   * %sccs.include.redist.c%
- *
- *     @(#)installboot.c       7.3 (Berkeley) %G%
   */
  
  #ifndef lint
  char copyright[] =
   */
  
  #ifndef lint
  char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1990 The Regents of the University of California.\n\
+"@(#) Copyright (c) 1986, 1990 The Regents of the University of California.\n\
   All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
   All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
-static char sccsid[] = "@(#)installboot.c      7.2 (Berkeley) 12/16/90";
+static char sccsid[] = "@(#)installboot.c      7.4 (Berkeley) %G%";
  #endif /* not lint */
  
  #endif /* not lint */
  
-#include "sys/param.h"
-#include "ufs/ffs/fs.h"
+#include <sys/param.h>
+#include <ufs/ffs/fs.h>
  
  char block[1024];
  int maxbootsize = 16 * 7 * 512;                /* XXX */
  
  char block[1024];
  int maxbootsize = 16 * 7 * 512;                /* XXX */
diff --git a/usr/src/sys/hp300/stand/ite.c b/usr/src/sys/hp300/stand/ite.c

index 9019d80..bc35e9e 100644 (file)
--- a/usr/src/sys/hp300/stand/ite.c
+++ b/usr/src/sys/hp300/stand/ite.c
@@ -11,21 +11,21 @@
   *
   * from: Utah $Hdr: ite.c 1.23 92/02/28$
   *
   *
   * from: Utah $Hdr: ite.c 1.23 92/02/28$
   *
- *     @(#)ite.c       7.4 (Berkeley) %G%
+ *     @(#)ite.c       7.5 (Berkeley) %G%
   */
  
  /*
   * Standalone Internal Terminal Emulator (CRT and keyboard)
   */
   */
  
  /*
   * Standalone Internal Terminal Emulator (CRT and keyboard)
   */
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/cons.h"
-#include "hp/dev/device.h"
-#include "hp/dev/itevar.h"
-#include "hp/dev/grfreg.h"
+#include <sys/param.h>
+#include <hp/dev/cons.h>
+#include <hp/dev/device.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/grfreg.h>
  
  extern int nodev();
  extern u_char ite_readbyte();
  
  extern int nodev();
  extern u_char ite_readbyte();
diff --git a/usr/src/sys/hp300/stand/ite_dv.c b/usr/src/sys/hp300/stand/ite_dv.c

index 012875f..d3fcb9e 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_dv.c
+++ b/usr/src/sys/hp300/stand/ite_dv.c
@@ -11,17 +11,17 @@
   *
   * from: Utah $Hdr: ite_dv.c 1.2 92/01/20$
   *
   *
   * from: Utah $Hdr: ite_dv.c 1.2 92/01/20$
   *
- *     @(#)ite_dv.c    7.3 (Berkeley) %G%
+ *     @(#)ite_dv.c    7.4 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "../dev/grf_dvreg.h"
+#include <sys/param.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_dvreg.h>
  
  #define REGBASE                ((struct dvboxfb *)(ip->regbase))
  #define WINDOWMOVER    dvbox_windowmove
  
  #define REGBASE                ((struct dvboxfb *)(ip->regbase))
  #define WINDOWMOVER    dvbox_windowmove
diff --git a/usr/src/sys/hp300/stand/ite_gb.c b/usr/src/sys/hp300/stand/ite_gb.c

index 34452e0..d3c6517 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_gb.c
+++ b/usr/src/sys/hp300/stand/ite_gb.c
@@ -11,18 +11,18 @@
   *
   * from: Utah $Hdr: ite_gb.c 1.9 92/01/20$
   *
   *
   * from: Utah $Hdr: ite_gb.c 1.9 92/01/20$
   *
- *     @(#)ite_gb.c    7.3 (Berkeley) %G%
+ *     @(#)ite_gb.c    7.4 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
+#include <sys/param.h>
  
  
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "../dev/grf_gbreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_gbreg.h>
  
  #define REGBASE        ((struct gboxfb *)(ip->regbase))
  #define WINDOWMOVER    gbox_windowmove
  
  #define REGBASE        ((struct gboxfb *)(ip->regbase))
  #define WINDOWMOVER    gbox_windowmove
diff --git a/usr/src/sys/hp300/stand/ite_hy.c b/usr/src/sys/hp300/stand/ite_hy.c

index f2efc09..4e598d9 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_hy.c
+++ b/usr/src/sys/hp300/stand/ite_hy.c
@@ -12,17 +12,17 @@
   *
   * from: Utah $Hdr: ite_hy.c 1.1 92/01/22$
   *
   *
   * from: Utah $Hdr: ite_hy.c 1.1 92/01/22$
   *
- *     @(#)ite_hy.c    7.2 (Berkeley) %G%
+ *     @(#)ite_hy.c    7.3 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  #ifdef ITECONSOLE
-#include "sys/param.h"
+#include <sys/param.h>
  
  
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "../dev/grf_hyreg.h"
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp300/dev/grf_hyreg.h>
  
  #define REGBASE                ((struct hyboxfb *)(ip->regbase))
  #define WINDOWMOVER     hyper_windowmove
  
  #define REGBASE                ((struct hyboxfb *)(ip->regbase))
  #define WINDOWMOVER     hyper_windowmove
@@ -138,7 +138,7 @@ hyper_scroll(ip, sy, sx, count, dir)
                          ip->cols  * ip->ftwidth, RR_COPY);
  }
  
                          ip->cols  * ip->ftwidth, RR_COPY);
  }
  
-#include "../dev/maskbits.h"
+#include <hp300/dev/maskbits.h>
  
  /* NOTE:
   * the first element in starttab could be 0xffffffff.  making it 0
  
  /* NOTE:
   * the first element in starttab could be 0xffffffff.  making it 0
diff --git a/usr/src/sys/hp300/stand/ite_rb.c b/usr/src/sys/hp300/stand/ite_rb.c

index 4c3b67e..4c351cc 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_rb.c
+++ b/usr/src/sys/hp300/stand/ite_rb.c
@@ -11,18 +11,18 @@
   *
   * from: Utah $Hdr: ite_rb.c 1.6 92/01/20$
   *
   *
   * from: Utah $Hdr: ite_rb.c 1.6 92/01/20$
   *
- *     @(#)ite_rb.c    7.3 (Berkeley) %G%
+ *     @(#)ite_rb.c    7.4 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
+#include <sys/param.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
  
  
-#include "../dev/grf_rbreg.h"
+#include <hp300/dev/grf_rbreg.h>
  
  #define REGBASE                ((struct rboxfb *)(ip->regbase))
  #define WINDOWMOVER    rbox_windowmove
  
  #define REGBASE                ((struct rboxfb *)(ip->regbase))
  #define WINDOWMOVER    rbox_windowmove
diff --git a/usr/src/sys/hp300/stand/ite_subr.c b/usr/src/sys/hp300/stand/ite_subr.c

index eb79753..c1adbd3 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_subr.c
+++ b/usr/src/sys/hp300/stand/ite_subr.c
@@ -11,16 +11,16 @@
   *
   * from: Utah $Hdr: ite_subr.c 1.2 92/01/20$
   *
   *
   * from: Utah $Hdr: ite_subr.c 1.2 92/01/20$
   *
- *     @(#)ite_subr.c  7.3 (Berkeley) %G%
+ *     @(#)ite_subr.c  7.4 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
+#include <sys/param.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
  
  ite_fontinfo(ip)
         struct ite_softc *ip;
  
  ite_fontinfo(ip)
         struct ite_softc *ip;
diff --git a/usr/src/sys/hp300/stand/ite_tc.c b/usr/src/sys/hp300/stand/ite_tc.c

index d072778..1ab42e0 100644 (file)
--- a/usr/src/sys/hp300/stand/ite_tc.c
+++ b/usr/src/sys/hp300/stand/ite_tc.c
@@ -11,18 +11,18 @@
   *
   * from: Utah $Hdr: ite_tc.c 1.11 92/01/20$
   *
   *
   * from: Utah $Hdr: ite_tc.c 1.11 92/01/20$
   *
- *     @(#)ite_tc.c    7.3 (Berkeley) %G%
+ *     @(#)ite_tc.c    7.4 (Berkeley) %G%
   */
  
   */
  
-#include "samachdep.h"
+#include <hp300/stand/samachdep.h>
  
  #ifdef ITECONSOLE
  
  
  #ifdef ITECONSOLE
  
-#include "sys/param.h"
-#include "hp/dev/itevar.h"
-#include "hp/dev/itereg.h"
-#include "hp/dev/grfreg.h"
-#include "../dev/grf_tcreg.h"
+#include <sys/param.h>
+#include <hp/dev/itevar.h>
+#include <hp/dev/itereg.h>
+#include <hp/dev/grfreg.h>
+#include <hp300/dev/grf_tcreg.h>
  
  #define REGBASE                ((struct tcboxfb *)(ip->regbase))
  #define WINDOWMOVER    topcat_windowmove
  
  #define REGBASE                ((struct tcboxfb *)(ip->regbase))
  #define WINDOWMOVER    topcat_windowmove
diff --git a/usr/src/sys/hp300/stand/libsa/Makefile b/usr/src/sys/hp300/stand/libsa/Makefile

index 58bb675..0ab4316 100644 (file)
--- a/usr/src/sys/hp300/stand/libsa/Makefile
+++ b/usr/src/sys/hp300/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%
  
  LIB=   sa
  SRCS=  bmap.c close.c dev.c getfile.c gets.c ioctl.c lseek.c open.c \
  
  LIB=   sa
  SRCS=  bmap.c close.c dev.c getfile.c gets.c ioctl.c lseek.c open.c \
@@ -8,4 +8,4 @@ NOPROFILE=noprofile
  
  .include <bsd.lib.mk>
  
  
  .include <bsd.lib.mk>
  
-CFLAGS+=-I../../.. -I..
+CFLAGS+=-I../../..
diff --git a/usr/src/sys/hp300/stand/machdep.c b/usr/src/sys/hp300/stand/machdep.c

index 744b490..10f8a01 100644 (file)
--- a/usr/src/sys/hp300/stand/machdep.c
+++ b/usr/src/sys/hp300/stand/machdep.c
@@ -11,10 +11,10 @@
   *
   * from: Utah $Hdr: machdep.c 1.10 92/06/18
   *
   *
   * from: Utah $Hdr: machdep.c 1.10 92/06/18
   *
- *     @(#)machdep.c   7.5 (Berkeley) %G%
+ *     @(#)machdep.c   7.6 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
+#include <sys/param.h>
  
  /*
   * Copy bytes within kernel
  
  /*
   * Copy bytes within kernel
diff --git a/usr/src/sys/hp300/stand/mkboot.c b/usr/src/sys/hp300/stand/mkboot.c

index aedc74f..3386bd6 100644 (file)
--- a/usr/src/sys/hp300/stand/mkboot.c
+++ b/usr/src/sys/hp300/stand/mkboot.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)mkboot.c    7.3 (Berkeley) %G%
+ *     @(#)mkboot.c    7.4 (Berkeley) %G%
   */
  
  #ifndef lint
   */
  
  #ifndef lint
@@ -17,10 +17,11 @@ char copyright[] =
  static char sccsid[] = "@(#)mkboot.c   7.2 (Berkeley) 12/16/90";
  #endif /* not lint */
  
  static char sccsid[] = "@(#)mkboot.c   7.2 (Berkeley) 12/16/90";
  #endif /* not lint */
  
-#include "sys/param.h"
-#include "sys/exec.h"
-#include "sys/file.h"
-#include "volhdr.h"
+#include <sys/param.h>
+#include <sys/exec.h>
+#include <sys/file.h>
+
+#include <hp300/stand/volhdr.h>
  
  #include <stdio.h>
  #include <ctype.h>
  
  #include <stdio.h>
  #include <ctype.h>
@@ -225,8 +226,8 @@ lifname(str)
         return(lname);
  }
  
         return(lname);
  }
  
-#include "sys/stat.h"
-#include "/usr/include/time.h" /* XXX */
+#include <sys/stat.h>
+#include <time.h>      /* XXX */
  
  bcddate(fd, toc)
         int fd;
  
  bcddate(fd, toc)
         int fd;
diff --git a/usr/src/sys/hp300/stand/nhpib.c b/usr/src/sys/hp300/stand/nhpib.c

index ef6b237..2b720fc 100644 (file)
--- a/usr/src/sys/hp300/stand/nhpib.c
+++ b/usr/src/sys/hp300/stand/nhpib.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)nhpib.c     7.2 (Berkeley) %G%
+ *     @(#)nhpib.c     7.3 (Berkeley) %G%
   */
  
  /*
   * Internal/98624 HPIB driver
   */
  
   */
  
  /*
   * Internal/98624 HPIB driver
   */
  
-#include "sys/param.h"
-#include "../dev/nhpibreg.h"
-#include "hpibvar.h"
+#include <sys/param.h>
+#include <hp300/dev/nhpibreg.h>
+#include <hp300/stand/hpibvar.h>
  
  nhpibinit(unit)
  {
  
  nhpibinit(unit)
  {
diff --git a/usr/src/sys/hp300/stand/rd.c b/usr/src/sys/hp300/stand/rd.c

index fcb2733..3d62ada 100644 (file)
--- a/usr/src/sys/hp300/stand/rd.c
+++ b/usr/src/sys/hp300/stand/rd.c
@@ -11,17 +11,17 @@
   *
   * from: Utah $Hdr: rd.c 1.17 92/06/18$
   *
   *
   * from: Utah $Hdr: rd.c 1.17 92/06/18$
   *
- *     @(#)rd.c        7.5 (Berkeley) %G%
+ *     @(#)rd.c        7.6 (Berkeley) %G%
   */
  
  /*
   * CS80/SS80 disk driver
   */
   */
  
  /*
   * CS80/SS80 disk driver
   */
-#include "sys/param.h"
-#include "saio.h"
-#include "samachdep.h"
+#include <sys/param.h>
+#include <stand/saio.h>
+#include <hp300/stand/samachdep.h>
  
  
-#include "../dev/rdreg.h"
+#include <hp300/dev/rdreg.h>
  
  struct rd_iocmd rd_ioc;
  struct rd_rscmd rd_rsc;
  
  struct rd_iocmd rd_ioc;
  struct rd_rscmd rd_rsc;
diff --git a/usr/src/sys/hp300/stand/scsi.c b/usr/src/sys/hp300/stand/scsi.c

index b6da5ce..c5b7b3b 100644 (file)
--- a/usr/src/sys/hp300/stand/scsi.c
+++ b/usr/src/sys/hp300/stand/scsi.c
@@ -11,21 +11,21 @@
   *
   * from: Utah $Hdr: scsi.c 1.3 90/01/27$
   *
   *
   * from: Utah $Hdr: scsi.c 1.3 90/01/27$
   *
- *     @(#)scsi.c      7.5 (Berkeley) %G%
+ *     @(#)scsi.c      7.6 (Berkeley) %G%
   */
  
  /*
   * SCSI bus driver for standalone programs.
   */
  
   */
  
  /*
   * SCSI bus driver for standalone programs.
   */
  
-#include "sys/param.h"
-#include "sys/reboot.h"
-#include "hp/dev/device.h"
-#include "../dev/scsireg.h"
-#include "scsivar.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <hp/dev/device.h>
+#include <hp300/dev/scsireg.h>
+#include <hp300/stand/scsivar.h>
  
  
-#include "saio.h"
-#include "samachdep.h"
+#include <stand/saio.h>
+#include <hp300/stand/samachdep.h>
  
  struct scsi_softc scsi_softc[NSCSI];
  
  
  struct scsi_softc scsi_softc[NSCSI];
  
diff --git a/usr/src/sys/hp300/stand/sd.c b/usr/src/sys/hp300/stand/sd.c

index ded4930..8db21a4 100644 (file)
--- a/usr/src/sys/hp300/stand/sd.c
+++ b/usr/src/sys/hp300/stand/sd.c
@@ -11,18 +11,18 @@
   *
   * from: Utah $Hdr: sd.c 1.2 90/01/23$
   *
   *
   * from: Utah $Hdr: sd.c 1.2 90/01/23$
   *
- *     @(#)sd.c        7.6 (Berkeley) %G%
+ *     @(#)sd.c        7.7 (Berkeley) %G%
   */
  
  /*
   * SCSI CCS disk driver
   */
  
   */
  
  /*
   * SCSI CCS disk driver
   */
  
-#include "sys/param.h"
-#include "saio.h"
-#include "samachdep.h"
+#include <sys/param.h>
+#include <stand/saio.h>
+#include <hp300/stand/samachdep.h>
  
  
-#include "../dev/scsireg.h"
+#include <hp300/dev/scsireg.h>
  
  struct sd_softc {
         char    sc_retry;
  
  struct sd_softc {
         char    sc_retry;
diff --git a/usr/src/sys/i386/i386/autoconf.c b/usr/src/sys/i386/i386/autoconf.c

index a927065..335e42c 100644 (file)
--- a/usr/src/sys/i386/i386/autoconf.c
+++ b/usr/src/sys/i386/i386/autoconf.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)autoconf.c  7.1 (Berkeley) %G%
+ *     @(#)autoconf.c  7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,16 +18,16 @@
   * devices are determined (from possibilities mentioned in ioconf.c),
   * and the drivers are initialized.
   */
   * devices are determined (from possibilities mentioned in ioconf.c),
   * and the drivers are initialized.
   */
-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "buf.h"
-#include "dkstat.h"
-#include "conf.h"
-#include "dmap.h"
-#include "reboot.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/conf.h>
+#include <sys/dmap.h>
+#include <sys/reboot.h>
  
  
-#include "machine/pte.h"
+#include <machine/pte.h>
  
  /*
   * The following several variables are related to
  
  /*
   * The following several variables are related to
diff --git a/usr/src/sys/i386/i386/conf.c b/usr/src/sys/i386/i386/conf.c

index 383dd29..7fb6894 100644 (file)
--- a/usr/src/sys/i386/i386/conf.c
+++ b/usr/src/sys/i386/i386/conf.c
@@ -4,15 +4,15 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)conf.c      5.10 (Berkeley) %G%
+ *     @(#)conf.c      5.11 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
diff --git a/usr/src/sys/i386/i386/cons.c b/usr/src/sys/i386/i386/cons.c

index 26e38b7..c652b20 100644 (file)
--- a/usr/src/sys/i386/i386/cons.c
+++ b/usr/src/sys/i386/i386/cons.c
@@ -9,21 +9,21 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)cons.c      7.2 (Berkeley) %G%
+ *     @(#)cons.c      7.3 (Berkeley) %G%
   */
  
  
   */
  
  
-#include "sys/param.h"
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/file.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
  
  
-#include "cons.h"
+#include <i386/i386/cons.h>
  
  /* XXX - all this could be autoconfig()ed */
  int pccnprobe(), pccninit(), pccngetc(), pccnputc();
  
  /* XXX - all this could be autoconfig()ed */
  int pccnprobe(), pccninit(), pccngetc(), pccnputc();
diff --git a/usr/src/sys/i386/i386/dkbad.c b/usr/src/sys/i386/i386/dkbad.c

index 93a9044..6bef47a 100644 (file)
--- a/usr/src/sys/i386/i386/dkbad.c
+++ b/usr/src/sys/i386/i386/dkbad.c
@@ -7,14 +7,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dkbad.c     5.4 (Berkeley) %G%
+ *     @(#)dkbad.c     5.5 (Berkeley) %G%
   */
  
  
  #ifndef NOBADSECT
   */
  
  
  #ifndef NOBADSECT
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/dkbad.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/dkbad.h>
  
  /*
   * Search the bad sector table looking for
  
  /*
   * Search the bad sector table looking for
diff --git a/usr/src/sys/i386/i386/genassym.c b/usr/src/sys/i386/i386/genassym.c

index 1b9768a..ff8a557 100644 (file)
--- a/usr/src/sys/i386/i386/genassym.c
+++ b/usr/src/sys/i386/i386/genassym.c
@@ -7,28 +7,28 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)genassym.c  5.15 (Berkeley) %G%
+ *     @(#)genassym.c  5.16 (Berkeley) %G%
   */
  
  #ifndef lint
   */
  
  #ifndef lint
-static char sccsid[] = "@(#)genassym.c 5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)genassym.c 5.16 (Berkeley) %G%";
  #endif /* not lint */
  
  #define KERNEL
  
  #endif /* not lint */
  
  #define KERNEL
  
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/map.h"
-#include "sys/proc.h"
-#include "sys/mbuf.h"
-#include "sys/msgbuf.h"
-#include "machine/cpu.h"
-#include "machine/trap.h"
-#include "machine/psl.h"
-#include "machine/reg.h"
-#include "sys/syscall.h"
-#include "vm/vm.h"
-#include "sys/user.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <machine/cpu.h>
+#include <machine/trap.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <sys/syscall.h>
+#include <vm/vm.h>
+#include <sys/user.h>
  
  main()
  {
  
  main()
  {
diff --git a/usr/src/sys/i386/i386/in_cksum.c b/usr/src/sys/i386/i386/in_cksum.c

index 4455c0c..2ca3613 100644 (file)
--- a/usr/src/sys/i386/i386/in_cksum.c
+++ b/usr/src/sys/i386/i386/in_cksum.c
@@ -5,13 +5,14 @@
   * %sccs.include.redist.c%
   *
   * from tahoe: in_cksum.c      1.2     86/01/05
   * %sccs.include.redist.c%
   *
   * from tahoe: in_cksum.c      1.2     86/01/05
- *     @(#)in_cksum.c  7.1 (Berkeley) %G%
+ *     @(#)in_cksum.c  7.2 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "sys/mbuf.h"
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
+#include <sys/param.h>
+#include <sys/mbuf.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
  
  /*
   * Checksum routine for Internet Protocol family headers.
  
  /*
   * Checksum routine for Internet Protocol family headers.
diff --git a/usr/src/sys/i386/i386/kgdb_glue.c b/usr/src/sys/i386/i386/kgdb_glue.c

index 8ad60f9..8421f49 100644 (file)
--- a/usr/src/sys/i386/i386/kgdb_glue.c
+++ b/usr/src/sys/i386/i386/kgdb_glue.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kgdb_glue.c 7.2 (Berkeley) %G%
+ *     @(#)kgdb_glue.c 7.3 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,9 +13,9 @@
  
  #ifdef KGDB
  
  
  #ifdef KGDB
  
-#include "param.h"
-#include "machine/frame.h"
-#include "machine/reg.h"
+#include <sys/param.h>
+#include <machine/frame.h>
+#include <machine/reg.h>
  
  #ifndef lint
  static char rcsid[] =
  
  #ifndef lint
  static char rcsid[] =
diff --git a/usr/src/sys/i386/i386/kgdb_stub.c b/usr/src/sys/i386/i386/kgdb_stub.c

index 924be8e..2ccdb80 100644 (file)
--- a/usr/src/sys/i386/i386/kgdb_stub.c
+++ b/usr/src/sys/i386/i386/kgdb_stub.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kgdb_stub.c 7.3 (Berkeley) %G%
+ *     @(#)kgdb_stub.c 7.4 (Berkeley) %G%
   */
  /*
   * "Stub" to allow remote cpu to debug over a serial line using gdb.
   */
  /*
   * "Stub" to allow remote cpu to debug over a serial line using gdb.
@@ -14,18 +14,18 @@
  static char rcsid[] = "$Header: /u/donn/c/gdb/kernel/RCS/kgdb_stub.c,v 1.2 91/03/31 19:22:46 donn Exp Locker: donn $";
  #endif
  
  static char rcsid[] = "$Header: /u/donn/c/gdb/kernel/RCS/kgdb_stub.c,v 1.2 91/03/31 19:22:46 donn Exp Locker: donn $";
  #endif
  
-#include "param.h"
-#include "systm.h"
-#include "../include/trap.h"
-#include "../include/cpu.h"
-#include "../include/psl.h"
-#include "../include/reg.h"
-#include "buf.h"
-#include "cons.h"
-#include "errno.h"
-
-#include "kgdb_proto.h"
-#include "machine/remote-sl.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <machine/trap.h>
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <sys/buf.h>
+#include <i386/i386/cons.h>
+#include <sys/errno.h>
+
+#include <i386/i386/kgdb_proto.h>
+#include <machine/remote-sl.h>
  
  extern int kernacc();
  #if 0
  
  extern int kernacc();
  #if 0
diff --git a/usr/src/sys/i386/i386/locore.s b/usr/src/sys/i386/i386/locore.s

index 68df7c3..1f22fa5 100644 (file)
--- a/usr/src/sys/i386/i386/locore.s
+++ b/usr/src/sys/i386/i386/locore.s
@@ -7,16 +7,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)locore.s    7.9 (Berkeley) %G%
+ *     @(#)locore.s    7.10 (Berkeley) %G%
   */
  
  #include "assym.s"
   */
  
  #include "assym.s"
-#include "machine/psl.h"
-#include "machine/pte.h"
+#include <machine/psl.h>
+#include <machine/pte.h>
  
  
-#include "errno.h"
+#include <sys/errno.h>
  
  
-#include "machine/trap.h"
+#include <machine/trap.h>
  
  #include "npx.h"
  
  
  #include "npx.h"
  
@@ -1581,4 +1581,4 @@ ENTRY(DELAY)
         ret     
  
  #include "vector.s"
         ret     
  
  #include "vector.s"
-#include "i386/isa/icu.s"
+#include <i386/isa/icu.s>
diff --git a/usr/src/sys/i386/i386/machdep.c b/usr/src/sys/i386/i386/machdep.c

index 09b5820..01e3fb4 100644 (file)
--- a/usr/src/sys/i386/i386/machdep.c
+++ b/usr/src/sys/i386/i386/machdep.c
@@ -7,39 +7,40 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)machdep.c   7.14 (Berkeley) %G%
+ *     @(#)machdep.c   7.15 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "signalvar.h"
-#include "kernel.h"
-#include "map.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "reboot.h"
-#include "conf.h"
-#include "file.h"
-#include "clist.h"
-#include "callout.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "msgbuf.h"
-#include "net/netisr.h"
-
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/reboot.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/clist.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+
+#include <net/netisr.h>
+
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
  
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
  
-#include "machine/cpu.h"
-#include "machine/reg.h"
-#include "machine/psl.h"
-#include "machine/specialreg.h"
-#include "i386/isa/rtc.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <machine/specialreg.h>
+#include <i386/isa/rtc.h>
  
  /*
   * Declare these as initialized data so we can patch them.
  
  /*
   * Declare these as initialized data so we can patch them.
@@ -857,7 +858,7 @@ init386(first) { extern ssdtosd(), lgdt(), lidt(), lldt(), etext;
         setidt(30, &IDTVEC(rsvd13),  SDT_SYS386TGT, SEL_KPL);
         setidt(31, &IDTVEC(rsvd14),  SDT_SYS386TGT, SEL_KPL);
  
         setidt(30, &IDTVEC(rsvd13),  SDT_SYS386TGT, SEL_KPL);
         setidt(31, &IDTVEC(rsvd14),  SDT_SYS386TGT, SEL_KPL);
  
-#include       "isa.h"
+#include "isa.h"
  #if    NISA >0
         isa_defaultirq();
  #endif
  #if    NISA >0
         isa_defaultirq();
  #endif
diff --git a/usr/src/sys/i386/i386/mem.c b/usr/src/sys/i386/i386/mem.c

index df340bb..33d0b3c 100644 (file)
--- a/usr/src/sys/i386/i386/mem.c
+++ b/usr/src/sys/i386/i386/mem.c
@@ -11,26 +11,26 @@
   * %sccs.include.redist.c%
   *
   * from: Utah $Hdr: mem.c 1.13 89/10/08$
   * %sccs.include.redist.c%
   *
   * from: Utah $Hdr: mem.c 1.13 89/10/08$
- *     @(#)mem.c       7.6 (Berkeley) %G%
+ *     @(#)mem.c       7.7 (Berkeley) %G%
   */
  
  /*
   * Memory special file
   */
  
   */
  
  /*
   * Memory special file
   */
  
-#include "param.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "uio.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
  
  extern        char *vmmap;            /* poor name! */
  /*ARGSUSED*/
  
  extern        char *vmmap;            /* poor name! */
  /*ARGSUSED*/
diff --git a/usr/src/sys/i386/i386/pmap.c b/usr/src/sys/i386/i386/pmap.c

index f292ac1..be4c60e 100644 (file)
--- a/usr/src/sys/i386/i386/pmap.c
+++ b/usr/src/sys/i386/i386/pmap.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pmap.c      7.11 (Berkeley) %G%
+ *     @(#)pmap.c      7.12 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -51,17 +51,19 @@
   *     and to when physical maps must be made correct.
   */
  
   *     and to when physical maps must be made correct.
   */
  
-#include "param.h"
-#include "proc.h"
-#include "malloc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/user.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
-/*#include "vm/vm_pageout.h"*/
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-/*#include "machine/isa.h"*/
+#ifdef NOTDEF
+include <vm/vm_pageout.h>
+include <machine/isa.h>
+#endif
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
@@ -158,7 +160,7 @@ boolean_t   pmap_testbit();
  void           pmap_clear_modify();
  
  #if BSDVM_COMPAT
  void           pmap_clear_modify();
  
  #if BSDVM_COMPAT
-#include "msgbuf.h"
+#include <sys/msgbuf.h>
  
  /*
   * All those kernel PT submaps that BSD is so fond of
  
  /*
   * All those kernel PT submaps that BSD is so fond of
diff --git a/usr/src/sys/i386/i386/swapgeneric.c b/usr/src/sys/i386/i386/swapgeneric.c

index 624a487..4a22448 100644 (file)
--- a/usr/src/sys/i386/i386/swapgeneric.c
+++ b/usr/src/sys/i386/i386/swapgeneric.c
@@ -7,17 +7,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)swapgeneric.c       5.5 (Berkeley) %G%
+ *     @(#)swapgeneric.c       5.6 (Berkeley) %G%
   */
  
   */
  
-#include "machine/pte.h"
+#include <machine/pte.h>
  
  
-#include "sys/param.h"
-#include "sys/conf.h"
-#include "sys/buf.h"
-#include "sys/vm.h"
-#include "sys/systm.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/vm.h>
+#include <sys/systm.h>
+#include <sys/reboot.h>
  
  /*
   * Generic configuration;  all in one
  
  /*
   * Generic configuration;  all in one
diff --git a/usr/src/sys/i386/i386/sys_machdep.c b/usr/src/sys/i386/i386/sys_machdep.c

index f9a8108..5720e9a 100644 (file)
--- a/usr/src/sys/i386/i386/sys_machdep.c
+++ b/usr/src/sys/i386/i386/sys_machdep.c
@@ -7,20 +7,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sys_machdep.c       5.6 (Berkeley) %G%
+ *     @(#)sys_machdep.c       5.7 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "file.h"
-#include "time.h"
-#include "proc.h"
-#include "uio.h"
-#include "kernel.h"
-#include "mtio.h"
-#include "buf.h"
-#include "trace.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/mtio.h>
+#include <sys/buf.h>
+#include <sys/trace.h>
  
  #ifdef TRACE
  int    nvualarm;
  
  #ifdef TRACE
  int    nvualarm;
diff --git a/usr/src/sys/i386/i386/trap.c b/usr/src/sys/i386/i386/trap.c

index 2c8f6a0..f461f47 100644 (file)
--- a/usr/src/sys/i386/i386/trap.c
+++ b/usr/src/sys/i386/i386/trap.c
@@ -7,33 +7,33 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)trap.c      7.12 (Berkeley) %G%
+ *     @(#)trap.c      7.13 (Berkeley) %G%
   */
  
  /*
   * 386 Trap and System call handleing
   */
  
   */
  
  /*
   * 386 Trap and System call handleing
   */
  
-#include "machine/cpu.h"
-#include "machine/psl.h"
-#include "machine/reg.h"
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
  
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "user.h"
-#include "acct.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/acct.h>
+#include <sys/kernel.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  #endif
  
-#include "vm/vm_param.h"
-#include "vm/pmap.h"
-#include "vm/vm_map.h"
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
  
  
-#include "machine/trap.h"
-#include "machine/dbg.h"
+#include <machine/trap.h>
+#include <machine/dbg.h>
  
  
  struct sysent sysent[];
  
  
  struct sysent sysent[];
diff --git a/usr/src/sys/i386/i386/vm_machdep.c b/usr/src/sys/i386/i386/vm_machdep.c

index e603e39..df07c2b 100644 (file)
--- a/usr/src/sys/i386/i386/vm_machdep.c
+++ b/usr/src/sys/i386/i386/vm_machdep.c
@@ -9,22 +9,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)vm_machdep.c        7.9 (Berkeley) %G%
+ *     @(#)vm_machdep.c        7.10 (Berkeley) %G%
   *     Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
   */
  
   *     Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "buf.h"
-#include "vnode.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/user.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
diff --git a/usr/src/sys/i386/include/cpu.h b/usr/src/sys/i386/include/cpu.h

index 90acc78..6476774 100644 (file)
--- a/usr/src/sys/i386/include/cpu.h
+++ b/usr/src/sys/i386/include/cpu.h
@@ -7,14 +7,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)cpu.h       5.5 (Berkeley) %G%
+ *     @(#)cpu.h       5.6 (Berkeley) %G%
   */
  
  /*
   * Definitions unique to i386 cpu support.
   */
   */
  
  /*
   * Definitions unique to i386 cpu support.
   */
-#include "machine/frame.h"
-#include "machine/segments.h"
+#include <machine/frame.h>
+#include <machine/segments.h>
  
  /*
   * definitions of cpu-dependent requirements
  
  /*
   * definitions of cpu-dependent requirements
diff --git a/usr/src/sys/i386/include/pcb.h b/usr/src/sys/i386/include/pcb.h

index 17bf11e..b4d1a56 100644 (file)
--- a/usr/src/sys/i386/include/pcb.h
+++ b/usr/src/sys/i386/include/pcb.h
@@ -7,14 +7,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pcb.h       5.10 (Berkeley) %G%
+ *     @(#)pcb.h       5.11 (Berkeley) %G%
   */
  
  /*
   * Intel 386 process control block
   */
   */
  
  /*
   * Intel 386 process control block
   */
-#include "machine/tss.h"
-#include "machine/npx.h"
+#include <machine/tss.h>
+#include <machine/npx.h>
  
  struct pcb {
         struct  i386tss pcb_tss;
  
  struct pcb {
         struct  i386tss pcb_tss;
diff --git a/usr/src/sys/i386/isa/clock.c b/usr/src/sys/i386/isa/clock.c

index 26ea311..11f10ea 100644 (file)
--- a/usr/src/sys/i386/isa/clock.c
+++ b/usr/src/sys/i386/isa/clock.c
@@ -7,19 +7,19 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)clock.c     7.2 (Berkeley) %G%
+ *     @(#)clock.c     7.3 (Berkeley) %G%
   */
  
  /*
   * Primitive clock interrupt routines.
   */
   */
  
  /*
   * Primitive clock interrupt routines.
   */
-#include "param.h"
-#include "time.h"
-#include "kernel.h"
-#include "machine/segments.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/rtc.h"
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <machine/segments.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/rtc.h>
  
  #define DAYST 119
  #define DAYEN 303
  
  #define DAYST 119
  #define DAYEN 303
diff --git a/usr/src/sys/i386/isa/com.c b/usr/src/sys/i386/isa/com.c

index ea59bac..37c8033 100644 (file)
--- a/usr/src/sys/i386/isa/com.c
+++ b/usr/src/sys/i386/isa/com.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)com.c       7.8 (Berkeley) %G%
+ *     @(#)com.c       7.9 (Berkeley) %G%
   */
  
  #include "com.h"
   */
  
  #include "com.h"
@@ -13,21 +13,21 @@
   * COM driver, based on HP dca driver
   * uses National Semiconductor NS16450/NS16550AF UART
   */
   * COM driver, based on HP dca driver
   * uses National Semiconductor NS16450/NS16550AF UART
   */
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "user.h"
-#include "conf.h"
-#include "file.h"
-#include "uio.h"
-#include "kernel.h"
-#include "syslog.h"
-
-#include "i386/isa/isa_device.h"
-#include "i386/isa/comreg.h"
-#include "i386/isa/ic/ns16550.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <i386/isa/isa_device.h>
+#include <i386/isa/comreg.h>
+#include <i386/isa/ic/ns16550.h>
  
  void   comstart();
  int    comprobe(), comattach(), comintr(), comparam();
  
  void   comstart();
  int    comprobe(), comattach(), comintr(), comparam();
@@ -74,7 +74,7 @@ struct speedtab comspeedtab[] = {
  
  extern struct tty *constty;
  #ifdef KGDB
  
  extern struct tty *constty;
  #ifdef KGDB
-#include "machine/remote-sl.h"
+#include <machine/remote-sl.h>
  
  extern int kgdb_dev;
  extern int kgdb_rate;
  
  extern int kgdb_dev;
  extern int kgdb_rate;
@@ -573,7 +573,7 @@ commctl(dev, bits, how)
  /*
   * Following are all routines needed for COM to act as console
   */
  /*
   * Following are all routines needed for COM to act as console
   */
-#include "i386/i386/cons.h"
+#include <i386/i386/cons.h>
  
  comcnprobe(cp)
         struct consdev *cp;
  
  comcnprobe(cp)
         struct consdev *cp;
diff --git a/usr/src/sys/i386/isa/fd.c b/usr/src/sys/i386/isa/fd.c

index bc60a1d..4ac8fad 100644 (file)
--- a/usr/src/sys/i386/isa/fd.c
+++ b/usr/src/sys/i386/isa/fd.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fd.c        7.7 (Berkeley) %G%
+ *     @(#)fd.c        7.8 (Berkeley) %G%
   */
  
  #include "fd.h"
   */
  
  #include "fd.h"
@@ -16,18 +16,18 @@
   * This driver assumed that NFD == 2. Now it works for NFD == 1 or NFD == 2
   * It will probably not work for NFD > 2.
   */
   * This driver assumed that NFD == 2. Now it works for NFD == 1 or NFD == 2
   * It will probably not work for NFD > 2.
   */
-#include "param.h"
-#include "dkbad.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "ioctl.h"
-#include "buf.h"
-#include "uio.h"
-
-#include "i386/isa/isa_device.h"
-#include "i386/isa/fdreg.h"
-#include "i386/isa/icu.h"
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+
+#include <i386/isa/isa_device.h>
+#include <i386/isa/fdreg.h>
+#include <i386/isa/icu.h>
  
  #define        FDUNIT(s)       ((s)&1)
  #define        FDTYPE(s)       (((s)>>1)&7)
  
  #define        FDUNIT(s)       ((s)&1)
  #define        FDTYPE(s)       (((s)>>1)&7)
diff --git a/usr/src/sys/i386/isa/fdreg.h b/usr/src/sys/i386/isa/fdreg.h

index 77f9e6c..4c93579 100644 (file)
--- a/usr/src/sys/i386/isa/fdreg.h
+++ b/usr/src/sys/i386/isa/fdreg.h
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fdreg.h     7.1 (Berkeley) %G%
+ *     @(#)fdreg.h     7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -12,7 +12,7 @@
   */
  
  /* uses NEC765 controller */
   */
  
  /* uses NEC765 controller */
-#include "../i386/isa/ic/nec765.h"
+#include <i386/isa/ic/nec765.h>
  
  /* registers */
  #define        fdout   2       /* Digital Output Register (W) */
  
  /* registers */
  #define        fdout   2       /* Digital Output Register (W) */
diff --git a/usr/src/sys/i386/isa/icu.s b/usr/src/sys/i386/isa/icu.s

index 95e5856..08389f8 100644 (file)
--- a/usr/src/sys/i386/isa/icu.s
+++ b/usr/src/sys/i386/isa/icu.s
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)icu.s       7.6 (Berkeley) %G%
+ *     @(#)icu.s       7.7 (Berkeley) %G%
   */
  
  
   */
  
  
@@ -29,7 +29,7 @@ _netmask:     .long   0
  _isa_intr:     .space  16*4
  
         .text
  _isa_intr:     .space  16*4
  
         .text
-#include "../net/netisr.h"
+#include <net/netisr.h>
  
  #define DONET(s, c)    ; \
         .globl  c ;  \
  
  #define DONET(s, c)    ; \
         .globl  c ;  \
diff --git a/usr/src/sys/i386/isa/if_apx.c b/usr/src/sys/i386/isa/if_apx.c

index 07b3172..03f8d2c 100644 (file)
--- a/usr/src/sys/i386/isa/if_apx.c
+++ b/usr/src/sys/i386/isa/if_apx.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_apx.c    7.10 (Berkeley) %G%
+ *     @(#)if_apx.c    7.11 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -20,22 +20,22 @@
  #include "apx.h"
  #if NAPX > 0
  
  #include "apx.h"
  #if NAPX > 0
  
-#include "param.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
  
  
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/if_types.h"
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/if_types.h>
  #ifdef CCITT
  #ifdef CCITT
-#include "netccitt/x25.h"
+#include <netccitt/x25.h>
  int x25_rtrequest(), x25_ifoutput();
  #endif
  
  int x25_rtrequest(), x25_ifoutput();
  #endif
  
-#include "if_apxreg.h"
+#include <i386/isa/if_apxreg.h>
  
  int    apxprobe(), apxattach(), apxstart(), apx_uprim(), apx_meminit();
  int    apxinit(), apxoutput(), apxioctl(), apxreset(), apxdebug = 0;
  
  int    apxprobe(), apxattach(), apxstart(), apx_uprim(), apx_meminit();
  int    apxinit(), apxoutput(), apxioctl(), apxreset(), apxdebug = 0;
@@ -91,7 +91,7 @@ struct        apc_modes apx_default_modes = {
  
  /* Begin bus & endian dependence */
  
  
  /* Begin bus & endian dependence */
  
-#include "isa_device.h"
+#include <i386/isa/isa_device.h>
  
  struct isa_driver apxdriver = {
         apxprobe, apxattach, "apx",
  
  struct isa_driver apxdriver = {
         apxprobe, apxattach, "apx",
diff --git a/usr/src/sys/i386/isa/if_ec.c b/usr/src/sys/i386/isa/if_ec.c

index 6f30639..6545521 100644 (file)
--- a/usr/src/sys/i386/isa/if_ec.c
+++ b/usr/src/sys/i386/isa/if_ec.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_ec.c     7.4 (Berkeley) %G%
+ *     @(#)if_ec.c     7.5 (Berkeley) %G%
   */
  
  
   */
  
  
@@ -16,42 +16,42 @@
  /*
   * Intel 82586/3com Etherlink II controller.
   */
  /*
   * Intel 82586/3com Etherlink II controller.
   */
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "syslog.h"
-#include "ioctl.h"
-#include "errno.h"
-
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #ifdef ISO
  extern char all_es_snpa[], all_is_snpa[], all_l1is_snpa[], all_l2is_snpa[];
  #endif
  
  #endif
  
  #ifdef ISO
  extern char all_es_snpa[], all_is_snpa[], all_l1is_snpa[], all_l2is_snpa[];
  #endif
  
-#include "if_ecreg.h"
+#include <i386/isa/if_ecreg.h>
  
  #if NBPFILTER > 0
  
  #if NBPFILTER > 0
-#include "../net/bpf.h"
-#include "../net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
  #endif
  
  int    ecdebug = 1;            /* console error messages */
  #endif
  
  int    ecdebug = 1;            /* console error messages */
@@ -96,7 +96,7 @@ struct        ec_softc {
         int     sc_rxlen;
  } ec_softc[NEC];
  
         int     sc_rxlen;
  } ec_softc[NEC];
  
-#include "isa_device.h"
+#include <i386/isa/isa_device.h>
  
  struct isa_driver ecdriver = {
         ecprobe, ecattach, "ec",
  
  struct isa_driver ecdriver = {
         ecprobe, ecattach, "ec",
diff --git a/usr/src/sys/i386/isa/if_ne.c b/usr/src/sys/i386/isa/if_ne.c

index a407549..6ca8785 100644 (file)
--- a/usr/src/sys/i386/isa/if_ne.c
+++ b/usr/src/sys/i386/isa/if_ne.c
@@ -5,7 +5,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_ne.c     7.4 (Berkeley) %G%
+ *     @(#)if_ne.c     7.5 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,36 +18,36 @@
  #include "ne.h"
  #if NNE > 0
  
  #include "ne.h"
  #if NNE > 0
  
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
  
  
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #endif
  
-#include "i386/isa/isa_device.h"
-#include "i386/isa/if_nereg.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/if_nereg.h>
+#include <i386/isa/icu.h>
  
  int    neprobe(), neattach(), neintr();
  int    nestart(),neinit(), ether_output(), neioctl();
  
  int    neprobe(), neattach(), neintr();
  int    nestart(),neinit(), ether_output(), neioctl();
diff --git a/usr/src/sys/i386/isa/if_nereg.h b/usr/src/sys/i386/isa/if_nereg.h

index 9a02a22..5d6e3af 100644 (file)
--- a/usr/src/sys/i386/isa/if_nereg.h
+++ b/usr/src/sys/i386/isa/if_nereg.h
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_nereg.h  7.1 (Berkeley) %G%
+ *     @(#)if_nereg.h  7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -13,7 +13,7 @@
  
  /* The NE2000 uses a DS8390 Ethernet controller in at the beginning of
     its i/o space */
  
  /* The NE2000 uses a DS8390 Ethernet controller in at the beginning of
     its i/o space */
-#include "ic/ds8390.h"
+#include <i386/isa/ic/ds8390.h>
  
  #define ne_data                0x10    /* Data Transfer port */
  #define ne_reset       0x1f    /* Card Reset port */
  
  #define ne_data                0x10    /* Data Transfer port */
  #define ne_reset       0x1f    /* Card Reset port */
diff --git a/usr/src/sys/i386/isa/if_we.c b/usr/src/sys/i386/isa/if_we.c

index a31c689..ad60d6d 100644 (file)
--- a/usr/src/sys/i386/isa/if_we.c
+++ b/usr/src/sys/i386/isa/if_we.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_we.c     7.4 (Berkeley) %G%
+ *     @(#)if_we.c     7.5 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -17,7 +17,7 @@
   */
   
  #include "we.h"
   */
   
  #include "we.h"
-#if    NWE > 0
+#if NWE > 0
  /*
   * Western Digital 8003 ethernet/starlan adapter
   *
  /*
   * Western Digital 8003 ethernet/starlan adapter
   *
@@ -27,31 +27,31 @@
   * The Western Digital card is one of many AT/MCA ethernet interfaces
   * based on the National DS8390 Network Interface chip set.
   */
   * The Western Digital card is one of many AT/MCA ethernet interfaces
   * based on the National DS8390 Network Interface chip set.
   */
-#include "param.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
  
  
-#include "net/if.h"
-#include "net/netisr.h"
+#include <net/if.h>
+#include <net/netisr.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #endif
  
-#include "i386/isa/if_wereg.h"
-#include "i386/isa/isa_device.h"
+#include <i386/isa/if_wereg.h>
+#include <i386/isa/isa_device.h>
   
  /*
   * This constant should really be 60 because the we adds 4 bytes of crc.
   
  /*
   * This constant should really be 60 because the we adds 4 bytes of crc.
diff --git a/usr/src/sys/i386/isa/isa.c b/usr/src/sys/i386/isa/isa.c

index da0641f..58dd97d 100644 (file)
--- a/usr/src/sys/i386/isa/isa.c
+++ b/usr/src/sys/i386/isa/isa.c
@@ -7,24 +7,25 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)isa.c       7.3 (Berkeley) %G%
+ *     @(#)isa.c       7.4 (Berkeley) %G%
   */
  
  /*
   * code to manage AT bus
   */
  
   */
  
  /*
   * code to manage AT bus
   */
  
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "buf.h"
-#include "uio.h"
-#include "syslog.h"
-#include "machine/segments.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/syslog.h>
+
+#include <machine/segments.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <vm/vm.h>
  
  /*
   * Configure all ISA devices
  
  /*
   * Configure all ISA devices
diff --git a/usr/src/sys/i386/isa/npx.c b/usr/src/sys/i386/isa/npx.c

index 793767a..ed23a58 100644 (file)
--- a/usr/src/sys/i386/isa/npx.c
+++ b/usr/src/sys/i386/isa/npx.c
@@ -5,23 +5,24 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)npx.c       7.4 (Berkeley) %G%
+ *     @(#)npx.c       7.5 (Berkeley) %G%
   */
  #include "npx.h"
  #if NNPX > 0
  
   */
  #include "npx.h"
  #if NNPX > 0
  
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "proc.h"
-#include "machine/cpu.h"
-#include "user.h"
-#include "machine/trap.h"
-#include "ioctl.h"
-#include "machine/specialreg.h"
-#include "i386/isa/isa_device.h"
-#include "icu.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+
+#include <machine/cpu.h>
+#include <machine/trap.h>
+#include <machine/specialreg.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
  /*
   * 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
   */
  /*
   * 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
   */
diff --git a/usr/src/sys/i386/isa/pccons.c b/usr/src/sys/i386/isa/pccons.c

index b1e9d80..d5297ac 100644 (file)
--- a/usr/src/sys/i386/isa/pccons.c
+++ b/usr/src/sys/i386/isa/pccons.c
@@ -7,26 +7,27 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pccons.c    5.14 (Berkeley) %G%
+ *     @(#)pccons.c    5.15 (Berkeley) %G%
   */
  
  /*
   * code to work keyboard & display for PC-style console
   */
   */
  
  /*
   * code to work keyboard & display for PC-style console
   */
-#include "param.h"
-#include "conf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "user.h"
-#include "tty.h"
-#include "uio.h"
-#include "i386/isa/isa_device.h"
-#include "callout.h"
-#include "systm.h"
-#include "kernel.h"
-#include "syslog.h"
-#include "i386/isa/icu.h"
-#include "i386/i386/cons.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
+#include <sys/callout.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <i386/i386/cons.h>
  
  struct tty pccons;
  
  
  struct tty pccons;
  
@@ -805,8 +806,8 @@ getchar()
         /*}*/
  }
  
         /*}*/
  }
  
-#include "machine/dbg.h"
-#include "machine/stdarg.h"
+#include <machine/dbg.h>
+#include <machine/stdarg.h>
  static nrow;
  
  void
  static nrow;
  
  void
diff --git a/usr/src/sys/i386/isa/wd.c b/usr/src/sys/i386/isa/wd.c

index 2fb74d6..cdddc5d 100644 (file)
--- a/usr/src/sys/i386/isa/wd.c
+++ b/usr/src/sys/i386/isa/wd.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)wd.c        7.3 (Berkeley) %G%
+ *     @(#)wd.c        7.4 (Berkeley) %G%
   */
  
  /* TODO:peel out buffer at low ipl,
   */
  
  /* TODO:peel out buffer at low ipl,
@@ -17,21 +17,22 @@
  #include "wd.h"
  #if    NWD > 0
  
  #include "wd.h"
  #if    NWD > 0
  
-#include "param.h"
-#include "dkbad.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "stat.h"
-#include "ioctl.h"
-#include "disklabel.h"
-#include "buf.h"
-#include "uio.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/wdreg.h"
-#include "syslog.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/disklabel.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/syslog.h>
+
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/wdreg.h>
+#include <vm/vm.h>
  
  #define        RETRIES         5       /* number of retries before giving up */
  #define        MAXTRANSFER     32      /* max size of transfer in page clusters */
  
  #define        RETRIES         5       /* number of retries before giving up */
  #define        MAXTRANSFER     32      /* max size of transfer in page clusters */
diff --git a/usr/src/sys/i386/isa/wt.c b/usr/src/sys/i386/isa/wt.c

index 69c36aa..f81772a 100644 (file)
--- a/usr/src/sys/i386/isa/wt.c
+++ b/usr/src/sys/i386/isa/wt.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)wt.c        7.1 (Berkeley) %G%
+ *     @(#)wt.c        7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -65,15 +65,13 @@
   *     Support Bell Tech QIC-02 and WANGTEK QIC-36 or QIC-02
   */
  
   *     Support Bell Tech QIC-02 and WANGTEK QIC-36 or QIC-02
   */
  
-/*#include <sys/errno.h>
-#include <sys/signal.h>
-#include <sys/types.h>*/
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/file.h"
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "i386/isa/wtreg.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+
+#include <i386/isa/wtreg.h>
  
  #ifdef ORC
  unsigned wtport = 0x288;       /* base I/O port of controller  */
  
  #ifdef ORC
  unsigned wtport = 0x288;       /* base I/O port of controller  */
@@ -1143,8 +1141,8 @@ wtdump()
  {
  }
  
  {
  }
  
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
  
  int    wtprobe(), wtattach();
  struct isa_driver wtdriver = {
  
  int    wtprobe(), wtattach();
  struct isa_driver wtdriver = {
diff --git a/usr/src/sys/i386/stand/boot.c b/usr/src/sys/i386/stand/boot.c

index 26757c4..27d34f5 100644 (file)
--- a/usr/src/sys/i386/stand/boot.c
+++ b/usr/src/sys/i386/stand/boot.c
@@ -15,14 +15,15 @@ char copyright[] =
  #endif /* not lint */
  
  #ifndef lint
  #endif /* not lint */
  
  #ifndef lint
-static char sccsid[] = "@(#)boot.c     7.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)boot.c     7.5 (Berkeley) %G%";
  #endif /* not lint */
  
  #endif /* not lint */
  
-#include "param.h"
-#include "reboot.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+
  #include <a.out.h>
  #include <setjmp.h>
  #include <a.out.h>
  #include <setjmp.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  /*
   * Boot program... arguments from lower-level bootstrap determine
  
  /*
   * Boot program... arguments from lower-level bootstrap determine
diff --git a/usr/src/sys/i386/stand/bootxx.c b/usr/src/sys/i386/stand/bootxx.c

index 2a67a96..95bccf0 100644 (file)
--- a/usr/src/sys/i386/stand/bootxx.c
+++ b/usr/src/sys/i386/stand/bootxx.c
@@ -7,14 +7,15 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)bootxx.c    7.2 (Berkeley) %G%
+ *     @(#)bootxx.c    7.3 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <sys/disklabel.h>
+
  #include <a.out.h>
  #include <a.out.h>
-#include "saio.h"
-#include "reboot.h"
-#include "disklabel.h"
+#include <stand/saio.h>
  
  char *bootprog = "/boot";
  extern int opendev, bootdev, cyloffset;
  
  char *bootprog = "/boot";
  extern int opendev, bootdev, cyloffset;
diff --git a/usr/src/sys/i386/stand/cga.c b/usr/src/sys/i386/stand/cga.c

index 8318dce..6a18cfa 100644 (file)
--- a/usr/src/sys/i386/stand/cga.c
+++ b/usr/src/sys/i386/stand/cga.c
@@ -7,10 +7,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)cga.c       7.3 (Berkeley) %G%
+ *     @(#)cga.c       7.4 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
+#include <sys/param.h>
  
  #define        COL             80
  #define        ROW             25
  
  #define        COL             80
  #define        ROW             25
diff --git a/usr/src/sys/i386/stand/conf.c b/usr/src/sys/i386/stand/conf.c

index a833299..473a483 100644 (file)
--- a/usr/src/sys/i386/stand/conf.c
+++ b/usr/src/sys/i386/stand/conf.c
@@ -7,11 +7,12 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)conf.c      7.3 (Berkeley) %G%
+ *     @(#)conf.c      7.4 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "stand/saio.h"
+#include <sys/param.h>
+
+#include <stand/saio.h>
  
  extern int     nullsys(), nodev(), noioctl();
  
  
  extern int     nullsys(), nodev(), noioctl();
  
diff --git a/usr/src/sys/i386/stand/fd.c b/usr/src/sys/i386/stand/fd.c

index bcb572a..09a6409 100644 (file)
--- a/usr/src/sys/i386/stand/fd.c
+++ b/usr/src/sys/i386/stand/fd.c
@@ -7,18 +7,19 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fd.c        7.3 (Berkeley) %G%
+ *     @(#)fd.c        7.4 (Berkeley) %G%
   */
  
  /****************************************************************************/
  /*                        standalone fd driver                               */
  /****************************************************************************/
   */
  
  /****************************************************************************/
  /*                        standalone fd driver                               */
  /****************************************************************************/
-#include "param.h"
-#include "dkbad.h"
-#include "i386/isa/disk.h"
-#include "i386/isa/fdreg.h"
-#include "i386/isa/isa.h"
-#include "saio.h"
+#include <sys/param.h>
+#include <sys/dkbad.h>
+
+#include <i386/isa/disk.h>
+#include <i386/isa/fdreg.h>
+#include <i386/isa/isa.h>
+#include <stand/saio.h>
  
  #define NUMRETRY 10
  /*#define FDDEBUG*/
  
  #define NUMRETRY 10
  /*#define FDDEBUG*/
diff --git a/usr/src/sys/i386/stand/prf.c b/usr/src/sys/i386/stand/prf.c

index 5869037..49d902e 100644 (file)
--- a/usr/src/sys/i386/stand/prf.c
+++ b/usr/src/sys/i386/stand/prf.c
@@ -7,10 +7,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)prf.c       7.4 (Berkeley) %G%
+ *     @(#)prf.c       7.5 (Berkeley) %G%
   */
  
   */
  
-#include "types.h"
+#include <sys/types.h>
  
  putchar(c)
  char c;
  
  putchar(c)
  char c;
diff --git a/usr/src/sys/i386/stand/wd.c b/usr/src/sys/i386/stand/wd.c

index 5c2a611..2ebe723 100644 (file)
--- a/usr/src/sys/i386/stand/wd.c
+++ b/usr/src/sys/i386/stand/wd.c
@@ -7,17 +7,18 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)wd.c        7.3 (Berkeley) %G%
+ *     @(#)wd.c        7.4 (Berkeley) %G%
   */
  
  /*  device driver for winchester disk  */
  
   */
  
  /*  device driver for winchester disk  */
  
-#include "param.h"
-#include "dkbad.h"
-#include "disklabel.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/wdreg.h"
-#include "saio.h"
+#include <sys/param.h>
+#include <sys/dkbad.h>
+#include <sys/disklabel.h>
+
+#include <i386/isa/isa.h>
+#include <i386/isa/wdreg.h>
+#include <stand/saio.h>
  
  #define        NWD             2       /* number of hard disk units supported, max 2 */
  #define        RETRIES         5       /* number of retries before giving up */
  
  #define        NWD             2       /* number of hard disk units supported, max 2 */
  #define        RETRIES         5       /* number of retries before giving up */
diff --git a/usr/src/sys/i386/stand/wdbootblk.c b/usr/src/sys/i386/stand/wdbootblk.c

index 5291e3c..4c29767 100644 (file)
--- a/usr/src/sys/i386/stand/wdbootblk.c
+++ b/usr/src/sys/i386/stand/wdbootblk.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)wdbootblk.c 7.1 (Berkeley) %G%
+ *     @(#)wdbootblk.c 7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -23,8 +23,10 @@
   *
   *     No attempt is made to handle disk errors.
   */
   *
   *     No attempt is made to handle disk errors.
   */
-#include "i386/isa/isa.h"
-#include "i386/isa/wdreg.h"
+
+#include <i386/isa/isa.h>
+#include <i386/isa/wdreg.h>
+
  #define        NOP     jmp 1f ; nop ; 1:
  #define BIOSRELOC      0x7c00
  #define start          0x70400
  #define        NOP     jmp 1f ; nop ; 1:
  #define BIOSRELOC      0x7c00
  #define start          0x70400
diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c

index 0bb04b6..7be6272 100644 (file)
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -4,23 +4,23 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)kern_acct.c 7.25 (Berkeley) %G%
+ *     @(#)kern_acct.c 7.26 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "namei.h"
-#include "resourcevar.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "termios.h"
-#include "tty.h"
-#include "vnode.h"
-#include "mount.h"
-#include "kernel.h"
-#include "file.h"
-#include "acct.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/resourcevar.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/acct.h>
+#include <sys/syslog.h>
  
  /*
   * Values associated with enabling and disabling accounting
  
  /*
   * Values associated with enabling and disabling accounting
diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c

index 8c6684a..38c39e6 100644 (file)
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -4,21 +4,21 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_clock.c        7.26 (Berkeley) %G%
+ *     @(#)kern_clock.c        7.27 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "dkstat.h"
-#include "callout.h"
-#include "kernel.h"
-#include "proc.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/dkstat.h>
+#include <sys/callout.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
  
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  #ifdef GPROF
  
  #ifdef GPROF
-#include "gmon.h"
+#include <sys/gmon.h>
  extern u_short *kcount;
  #endif
  
  extern u_short *kcount;
  #endif
  
diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c

index 2c6c0ff..43e2286 100644 (file)
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -4,24 +4,24 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_descrip.c      7.37 (Berkeley) %G%
+ *     @(#)kern_descrip.c      7.38 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "filedesc.h"
-#include "kernel.h"
-#include "vnode.h"
-#include "proc.h"
-#include "file.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "stat.h"
-#include "ioctl.h"
-#include "fcntl.h"
-#include "malloc.h"
-#include "syslog.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/vnode.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/syslog.h>
+#include <sys/resourcevar.h>
  
  /*
   * Descriptor management.
  
  /*
   * Descriptor management.
diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c

index e29cf20..ffe7469 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -4,40 +4,40 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)kern_exec.c 7.65 (Berkeley) %G%
+ *     @(#)kern_exec.c 7.66 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "filedesc.h"
-#include "kernel.h"
-#include "proc.h"
-#include "mount.h"
-#include "malloc.h"
-#include "namei.h"
-#include "vnode.h"
-#include "file.h"
-#include "acct.h"
-#include "exec.h"
-#include "ktrace.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/mount.h>
+#include <sys/malloc.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
+#include <sys/acct.h>
+#include <sys/exec.h>
+#include <sys/ktrace.h>
+#include <sys/resourcevar.h>
  
  
-#include "machine/cpu.h"
-#include "machine/reg.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
  
  
-#include "mman.h"
-#include "vm/vm.h"
-#include "vm/vm_param.h"
-#include "vm/vm_map.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_pager.h"
+#include <sys/mman.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_map.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_pager.h>
  
  
-#include "signalvar.h"
-#include "kinfo_proc.h"
+#include <sys/signalvar.h>
+#include <sys/kinfo_proc.h>
  
  #ifdef HPUXCOMPAT
  
  #ifdef HPUXCOMPAT
-#include "user.h"                      /* for pcb */
-#include "hp/hpux/hpux_exec.h"
+#include <sys/user.h>                  /* for pcb */
+#include <hp/hpux/hpux_exec.h>
  #endif
  
  #ifdef COPY_SIGCODE
  #endif
  
  #ifdef COPY_SIGCODE
diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c

index db2e2d3..f0cce76 100644 (file)
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -4,35 +4,35 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_exit.c 7.49 (Berkeley) %G%
+ *     @(#)kern_exit.c 7.50 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "time.h"
-#include "resource.h"
-#include "kernel.h"
-#include "buf.h"
-#include "wait.h"
-#include "file.h"
-#include "vnode.h"
-#include "syslog.h"
-#include "malloc.h"
-#include "resourcevar.h"
-#include "ptrace.h"
-
-#include "machine/cpu.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/wait.h>
+#include <sys/file.h>
+#include <sys/vnode.h>
+#include <sys/syslog.h>
+#include <sys/malloc.h>
+#include <sys/resourcevar.h>
+#include <sys/ptrace.h>
+
+#include <machine/cpu.h>
  #ifdef COMPAT_43
  #ifdef COMPAT_43
-#include "machine/reg.h"
-#include "machine/psl.h"
+#include <machine/reg.h>
+#include <machine/psl.h>
  #endif
  
  #endif
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
  
  /*
   * Exit system call: pass back caller's arg
  
  /*
   * Exit system call: pass back caller's arg
diff --git a/usr/src/sys/kern/kern_ktrace.c b/usr/src/sys/kern/kern_ktrace.c

index 2bb8452..06d65b7 100644 (file)
--- a/usr/src/sys/kern/kern_ktrace.c
+++ b/usr/src/sys/kern/kern_ktrace.c
@@ -4,19 +4,19 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_ktrace.c       7.20 (Berkeley) %G%
+ *     @(#)kern_ktrace.c       7.21 (Berkeley) %G%
   */
  
  #ifdef KTRACE
  
   */
  
  #ifdef KTRACE
  
-#include "param.h"
-#include "proc.h"
-#include "file.h"
-#include "namei.h"
-#include "vnode.h"
-#include "ktrace.h"
-#include "malloc.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/ktrace.h>
+#include <sys/malloc.h>
+#include <sys/syslog.h>
  
  struct ktr_header *
  ktrgetheader(type)
  
  struct ktr_header *
  ktrgetheader(type)
diff --git a/usr/src/sys/kern/kern_malloc.c b/usr/src/sys/kern/kern_malloc.c

index f3cb91c..895c749 100644 (file)
--- a/usr/src/sys/kern/kern_malloc.c
+++ b/usr/src/sys/kern/kern_malloc.c
@@ -4,16 +4,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_malloc.c       7.34 (Berkeley) %G%
+ *     @(#)kern_malloc.c       7.35 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "proc.h"
-#include "map.h"
-#include "kernel.h"
-#include "malloc.h"
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/map.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
  
  struct kmembuckets bucket[MINBUCKET + 16];
  struct kmemstats kmemstats[M_LAST];
  
  struct kmembuckets bucket[MINBUCKET + 16];
  struct kmemstats kmemstats[M_LAST];
diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c

index a51cc42..13fcf7e 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_resource.c     7.21 (Berkeley) %G%
+ *     @(#)kern_resource.c     7.22 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "kernel.h"
-#include "resourcevar.h"
-#include "malloc.h"
-#include "proc.h"
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/resourcevar.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
  
  
-#include "vm/vm.h"
+#include <vm/vm.h>
  
  /*
   * Resource controls and accounting.
  
  /*
   * Resource controls and accounting.
diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c

index 9a2fc94..8200f1c 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -4,31 +4,31 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_sig.c  7.50 (Berkeley) %G%
+ *     @(#)kern_sig.c  7.51 (Berkeley) %G%
   */
  
  #define        SIGPROP         /* include signal properties table */
   */
  
  #define        SIGPROP         /* include signal properties table */
-#include "param.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "namei.h"
-#include "vnode.h"
-#include "proc.h"
-#include "systm.h"
-#include "timeb.h"
-#include "times.h"
-#include "buf.h"
-#include "acct.h"
-#include "file.h"
-#include "kernel.h"
-#include "wait.h"
-#include "ktrace.h"
-
-#include "machine/cpu.h"
-
-#include "vm/vm.h"
-#include "kinfo_proc.h"
-#include "user.h"              /* for coredump */
+#include <sys/param.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/timeb.h>
+#include <sys/times.h>
+#include <sys/buf.h>
+#include <sys/acct.h>
+#include <sys/file.h>
+#include <sys/kernel.h>
+#include <sys/wait.h>
+#include <sys/ktrace.h>
+
+#include <machine/cpu.h>
+
+#include <vm/vm.h>
+#include <sys/kinfo_proc.h>
+#include <sys/user.h>          /* for coredump */
  
  /*
   * Can process p, with pcred pc, send the signal signo to process q?
  
  /*
   * Can process p, with pcred pc, send the signal signo to process q?
diff --git a/usr/src/sys/kern/kern_subr.c b/usr/src/sys/kern/kern_subr.c

index a3809e5..f47f83f 100644 (file)
--- a/usr/src/sys/kern/kern_subr.c
+++ b/usr/src/sys/kern/kern_subr.c
@@ -4,13 +4,13 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_subr.c 7.10 (Berkeley) %G%
+ *     @(#)kern_subr.c 7.11 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
  
  uiomove(cp, n, uio)
         register caddr_t cp;
  
  uiomove(cp, n, uio)
         register caddr_t cp;
diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c

index efc9f73..eda34e4 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -5,22 +5,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_synch.c        7.24 (Berkeley) %G%
+ *     @(#)kern_synch.c        7.25 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "kernel.h"
-#include "buf.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "vmmeter.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/buf.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/vmmeter.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  #endif
  
-#include "machine/cpu.h"
+#include <machine/cpu.h>
  
  u_char curpri;                 /* usrpri of curproc */
  int    lbolt;                  /* once a second sleep address */
  
  u_char curpri;                 /* usrpri of curproc */
  int    lbolt;                  /* once a second sleep address */
diff --git a/usr/src/sys/kern/kern_sysctl.c b/usr/src/sys/kern/kern_sysctl.c

index 9e69c0b..31067a7 100644 (file)
--- a/usr/src/sys/kern/kern_sysctl.c
+++ b/usr/src/sys/kern/kern_sysctl.c
@@ -4,20 +4,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_sysctl.c       7.24 (Berkeley) %G%
+ *     @(#)kern_sysctl.c       7.25 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "proc.h"
-#include "kinfo.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "buf.h"
-#include "file.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/kinfo.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/buf.h>
+#include <sys/file.h>
  
  
-#include "vm/vm.h"
+#include <vm/vm.h>
  
  
-#include "kinfo_proc.h"
+#include <sys/kinfo_proc.h>
  
  #define snderr(e) { error = (e); goto release;}
  extern int kinfo_doproc(), kinfo_rtable(), kinfo_vnode(), kinfo_file();
  
  #define snderr(e) { error = (e); goto release;}
  extern int kinfo_doproc(), kinfo_rtable(), kinfo_vnode(), kinfo_file();
diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c

index 4cfd632..ae663dc 100644 (file)
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -4,15 +4,15 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_time.c 7.19 (Berkeley) %G%
+ *     @(#)kern_time.c 7.20 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "resourcevar.h"
-#include "kernel.h"
-#include "systm.h"
-#include "proc.h"
-#include "vnode.h"
+#include <sys/param.h>
+#include <sys/resourcevar.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
  
  
  /* 
  
  
  /* 
diff --git a/usr/src/sys/kern/kern_xxx.c b/usr/src/sys/kern/kern_xxx.c

index a7e835b..d4c30ca 100644 (file)
--- a/usr/src/sys/kern/kern_xxx.c
+++ b/usr/src/sys/kern/kern_xxx.c
@@ -4,14 +4,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kern_xxx.c  7.19 (Berkeley) %G%
+ *     @(#)kern_xxx.c  7.20 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "proc.h"
-#include "reboot.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
  
  char   hostname[MAXHOSTNAMELEN];
  int    hostnamelen;
  
  char   hostname[MAXHOSTNAMELEN];
  int    hostnamelen;
diff --git a/usr/src/sys/kern/makesyscalls.sh b/usr/src/sys/kern/makesyscalls.sh

index e83c057..68e76e7 100644 (file)
--- a/usr/src/sys/kern/makesyscalls.sh
+++ b/usr/src/sys/kern/makesyscalls.sh
@@ -1,5 +1,5 @@
  #! /bin/sh -
  #! /bin/sh -
-#      @(#)makesyscalls.sh     7.6 (Berkeley) %G%
+#      @(#)makesyscalls.sh     7.7 (Berkeley) %G%
  
  set -e
  
  
  set -e
  
@@ -49,8 +49,8 @@ awk < $1 "
         }
         NR == 1 {
                 printf " * created from%s\n */\n\n", $0 > sysdcl
         }
         NR == 1 {
                 printf " * created from%s\n */\n\n", $0 > sysdcl
-               printf "#include \"param.h\"\n" > sysdcl
-               printf "#include \"systm.h\"\n\n" > sysdcl
+               printf "#include <sys/param.h>\n" > sysdcl
+               printf "#include <sys/systm.h>\n\n" > sysdcl
                 printf "int\tnosys();\n\n" > sysdcl
  
                 printf "struct sysent sysent[] = {\n" > sysent
                 printf "int\tnosys();\n\n" > sysdcl
  
                 printf "struct sysent sysent[] = {\n" > sysent
diff --git a/usr/src/sys/kern/subr_autoconf.c b/usr/src/sys/kern/subr_autoconf.c

index 7e228f7..29a0c82 100644 (file)
--- a/usr/src/sys/kern/subr_autoconf.c
+++ b/usr/src/sys/kern/subr_autoconf.c
@@ -8,14 +8,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)subr_autoconf.c     7.3 (Berkeley) %G%
+ *     @(#)subr_autoconf.c     7.4 (Berkeley) %G%
   *
   * from: $Header: subr_autoconf.c,v 1.6 92/06/11 17:56:19 torek Exp $ (LBL)
   */
  
   *
   * from: $Header: subr_autoconf.c,v 1.6 92/06/11 17:56:19 torek Exp $ (LBL)
   */
  
-#include "sys/param.h"
-#include "sys/device.h"
-#include "sys/malloc.h"
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
  
  /*
   * Autoconfiguration subroutines.
  
  /*
   * Autoconfiguration subroutines.
diff --git a/usr/src/sys/kern/subr_log.c b/usr/src/sys/kern/subr_log.c

index c183d84..736966a 100644 (file)
--- a/usr/src/sys/kern/subr_log.c
+++ b/usr/src/sys/kern/subr_log.c
@@ -4,20 +4,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)subr_log.c  7.17 (Berkeley) %G%
+ *     @(#)subr_log.c  7.18 (Berkeley) %G%
   */
  
  /*
   * Error log buffer for kernel printf's.
   */
  
   */
  
  /*
   * Error log buffer for kernel printf's.
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "vnode.h"
-#include "ioctl.h"
-#include "msgbuf.h"
-#include "file.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/ioctl.h>
+#include <sys/msgbuf.h>
+#include <sys/file.h>
  
  #define LOG_RDPRI      (PZERO + 1)
  
  
  #define LOG_RDPRI      (PZERO + 1)
  
diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c

index 6a80b20..39447e6 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)subr_prf.c  7.38 (Berkeley) %G%
+ *     @(#)subr_prf.c  7.39 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
@@ -29,7 +29,7 @@
  #include <machine/stdarg.h>
  
  #ifdef KADB
  #include <machine/stdarg.h>
  
  #ifdef KADB
-#include "machine/kdbparam.h"
+#include <machine/kdbparam.h>
  #endif
  
  #define TOCONS 0x01
  #endif
  
  #define TOCONS 0x01
diff --git a/usr/src/sys/kern/subr_rmap.c b/usr/src/sys/kern/subr_rmap.c

index 1f0a45e..37bf8c0 100644 (file)
--- a/usr/src/sys/kern/subr_rmap.c
+++ b/usr/src/sys/kern/subr_rmap.c
@@ -4,15 +4,15 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)subr_rmap.c 7.10 (Berkeley) %G%
+ *     @(#)subr_rmap.c 7.11 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "dmap.h"              /* XXX */
-#include "proc.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/dmap.h>          /* XXX */
+#include <sys/proc.h>
+#include <sys/kernel.h>
  
  /*
   * Resource map handling routines.
  
  /*
   * Resource map handling routines.
diff --git a/usr/src/sys/kern/subr_xxx.c b/usr/src/sys/kern/subr_xxx.c

index 71b8f2a..f43a074 100644 (file)
--- a/usr/src/sys/kern/subr_xxx.c
+++ b/usr/src/sys/kern/subr_xxx.c
@@ -4,16 +4,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)subr_xxx.c  7.13 (Berkeley) %G%
+ *     @(#)subr_xxx.c  7.14 (Berkeley) %G%
   */
  
  /*
   * Miscellaneous trivial functions, including many
   * that are often inline-expanded or done in assembler.
   */
   */
  
  /*
   * Miscellaneous trivial functions, including many
   * that are often inline-expanded or done in assembler.
   */
-#include "param.h"
-#include "systm.h"
-#include "machine/cpu.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <machine/cpu.h>
  
  /*
   * Unsupported device function (e.g. writing to read-only device).
  
  /*
   * Unsupported device function (e.g. writing to read-only device).
diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c

index 031f6b9..f7c4e1b 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -4,22 +4,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sys_generic.c       7.36 (Berkeley) %G%
+ *     @(#)sys_generic.c       7.37 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "filedesc.h"
-#include "ioctl.h"
-#include "file.h"
-#include "proc.h"
-#include "socketvar.h"
-#include "uio.h"
-#include "kernel.h"
-#include "stat.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/filedesc.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/socketvar.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/stat.h>
+#include <sys/malloc.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/kern/sys_process.c b/usr/src/sys/kern/sys_process.c

index 5eda10e..7ec471b 100644 (file)
--- a/usr/src/sys/kern/sys_process.c
+++ b/usr/src/sys/kern/sys_process.c
@@ -4,22 +4,22 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)sys_process.c       7.32 (Berkeley) %G%
+ *     @(#)sys_process.c       7.33 (Berkeley) %G%
   */
  
  #define IPCREG
   */
  
  #define IPCREG
-#include "param.h"
-#include "proc.h"
-#include "vnode.h"
-#include "buf.h"
-#include "ptrace.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/buf.h>
+#include <sys/ptrace.h>
  
  
-#include "machine/reg.h"
-#include "machine/psl.h"
-#include "vm/vm.h"
-#include "vm/vm_page.h"
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <vm/vm.h>
+#include <vm/vm_page.h>
  
  
-#include "user.h"
+#include <sys/user.h>
  
  /*
   * Priority for tracing
  
  /*
   * Priority for tracing
diff --git a/usr/src/sys/kern/sys_socket.c b/usr/src/sys/kern/sys_socket.c

index 87df568..aecaba9 100644 (file)
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -4,22 +4,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sys_socket.c        7.13 (Berkeley) %G%
+ *     @(#)sys_socket.c        7.14 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "file.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "ioctl.h"
-#include "stat.h"
-
-#include "net/if.h"
-#include "net/route.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+
+#include <net/if.h>
+#include <net/route.h>
  
  struct fileops socketops =
      { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
  
  struct fileops socketops =
      { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c

index 7281e35..1dc3507 100644 (file)
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: uipc_shm.c 1.11 92/04/23$
   *
   *
   * from: Utah $Hdr: uipc_shm.c 1.11 92/04/23$
   *
- *     @(#)sysv_shm.c  7.19 (Berkeley) %G%
+ *     @(#)sysv_shm.c  7.20 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,17 +22,18 @@
  
  #ifdef SYSVSHM
  
  
  #ifdef SYSVSHM
  
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "proc.h"
-#include "shm.h"
-#include "malloc.h"
-#include "mman.h"
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_inherit.h"
-#include "vm/vm_pager.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/shm.h>
+#include <sys/malloc.h>
+#include <sys/mman.h>
+
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_inherit.h>
+#include <vm/vm_pager.h>
  
  int    shmat(), shmctl(), shmdt(), shmget();
  int    (*shmcalls[])() = { shmat, shmctl, shmdt, shmget };
  
  int    shmat(), shmctl(), shmdt(), shmget();
  int    (*shmcalls[])() = { shmat, shmctl, shmdt, shmget };
diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c

index 94155c7..6c6c3b0 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -5,29 +5,29 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty.c       7.54 (Berkeley) %G%
+ *     @(#)tty.c       7.55 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "proc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
  #define TTYDEFCHARS
  #define TTYDEFCHARS
-#include "tty.h"
+#include <sys/tty.h>
  #undef TTYDEFCHARS
  #define TTYDEFCHARS
  #include "ttydefaults.h"
  #undef TTYDEFCHARS
  #include "termios.h"
  #undef TTYDEFCHARS
  #define TTYDEFCHARS
  #include "ttydefaults.h"
  #undef TTYDEFCHARS
  #include "termios.h"
-#include "file.h"
-#include "conf.h"
-#include "dkstat.h"
-#include "uio.h"
-#include "kernel.h"
-#include "vnode.h"
-#include "syslog.h"
-
-#include "vm/vm.h"
+#include <sys/file.h>
+#include <sys/conf.h>
+#include <sys/dkstat.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/vnode.h>
+#include <sys/syslog.h>
+
+#include <vm/vm.h>
  #include "syslog.h"
  
  static int proc_compare __P((struct proc *p1, struct proc *p2));
  #include "syslog.h"
  
  static int proc_compare __P((struct proc *p1, struct proc *p2));
diff --git a/usr/src/sys/kern/tty_compat.c b/usr/src/sys/kern/tty_compat.c

index 7c9d27b..a53f4e3 100644 (file)
--- a/usr/src/sys/kern/tty_compat.c
+++ b/usr/src/sys/kern/tty_compat.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty_compat.c        7.15 (Berkeley) %G%
+ *     @(#)tty_compat.c        7.16 (Berkeley) %G%
   */
  
  /* 
   */
  
  /* 
@@ -12,16 +12,16 @@
   */
  #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
  
   */
  #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
  
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "termios.h"
-#include "file.h"
-#include "conf.h"
-#include "kernel.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/termios.h>
+#include <sys/file.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
  
  int ttydebug = 0;
  
  
  int ttydebug = 0;
  
diff --git a/usr/src/sys/kern/tty_conf.c b/usr/src/sys/kern/tty_conf.c

index a1a1d10..981938d 100644 (file)
--- a/usr/src/sys/kern/tty_conf.c
+++ b/usr/src/sys/kern/tty_conf.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty_conf.c  7.8 (Berkeley) %G%
+ *     @(#)tty_conf.c  7.9 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
  
  #define        ttynodisc ((int (*) __P((dev_t, struct tty *)))enodev)
  #define        ttyerrclose ((int (*) __P((struct tty *, int flags)))enodev)
  
  #define        ttynodisc ((int (*) __P((dev_t, struct tty *)))enodev)
  #define        ttyerrclose ((int (*) __P((struct tty *, int flags)))enodev)
diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c

index 602fbe7..43bffc6 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty_pty.c   7.27 (Berkeley) %G%
+ *     @(#)tty_pty.c   7.28 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -14,16 +14,16 @@
  #include "pty.h"
  
  #if NPTY > 0
  #include "pty.h"
  
  #if NPTY > 0
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "conf.h"
-#include "file.h"
-#include "uio.h"
-#include "kernel.h"
-#include "vnode.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/vnode.h>
  #include "tsleep.h"
  
  #if NPTY == 1
  #include "tsleep.h"
  
  #if NPTY == 1
diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c

index df19a34..c13f013 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -4,16 +4,16 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)tty_subr.c  7.10 (Berkeley) %G%
+ *     @(#)tty_subr.c  7.11 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "clist.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/clist.h>
  
  char   cwaiting;
  
  
  char   cwaiting;
  
diff --git a/usr/src/sys/kern/tty_tb.c b/usr/src/sys/kern/tty_tb.c

index c8df5b8..201f106 100644 (file)
--- a/usr/src/sys/kern/tty_tb.c
+++ b/usr/src/sys/kern/tty_tb.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty_tb.c    7.7 (Berkeley) %G%
+ *     @(#)tty_tb.c    7.8 (Berkeley) %G%
   */
  
  #include "tb.h"
   */
  
  #include "tb.h"
@@ -14,9 +14,9 @@
   * Line discipline for RS232 tablets;
   * supplies binary coordinate data.
   */
   * Line discipline for RS232 tablets;
   * supplies binary coordinate data.
   */
-#include "param.h"
-#include "tablet.h"
-#include "tty.h"
+#include <sys/param.h>
+#include <sys/tablet.h>
+#include <sys/tty.h>
  
  /*
   * Tablet configuration table.
  
  /*
   * Tablet configuration table.
diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c

index 954813e..37f7ad5 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -4,20 +4,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tty_tty.c   7.19 (Berkeley) %G%
+ *     @(#)tty_tty.c   7.20 (Berkeley) %G%
   */
  
  /*
   * Indirect driver for controlling tty.
   */
   */
  
  /*
   * Indirect driver for controlling tty.
   */
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "tty.h"
-#include "vnode.h"
-#include "file.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
  
  #define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)
  
  
  #define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)
  
diff --git a/usr/src/sys/kern/uipc_domain.c b/usr/src/sys/kern/uipc_domain.c

index fa67b61..207f5c6 100644 (file)
--- a/usr/src/sys/kern/uipc_domain.c
+++ b/usr/src/sys/kern/uipc_domain.c
@@ -4,17 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_domain.c       7.9 (Berkeley) %G%
+ *     @(#)uipc_domain.c       7.10 (Berkeley) %G%
   */
  
   */
  
-#include <sys/cdefs.h>
-#include "param.h"
-#include "socket.h"
-#include "protosw.h"
-#include "domain.h"
-#include "mbuf.h"
-#include "time.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/mbuf.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
  
  #define        ADDDOMAIN(x)    { \
         extern struct domain __CONCAT(x,domain); \
  
  #define        ADDDOMAIN(x)    { \
         extern struct domain __CONCAT(x,domain); \
diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c

index fbe52ed..85d2e48 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -3,21 +3,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_mbuf.c 7.24 (Berkeley) %G%
+ *     @(#)uipc_mbuf.c 7.25 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "map.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/map.h>
  #define MBTYPES
  #define MBTYPES
-#include "mbuf.h"
-#include "kernel.h"
-#include "syslog.h"
-#include "domain.h"
-#include "protosw.h"
-#include "vm/vm.h"
+#include <sys/mbuf.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+#include <sys/domain.h>
+#include <sys/protosw.h>
+
+#include <vm/vm.h>
  
  extern vm_map_t mb_map;
  struct mbuf *mbutl;
  
  extern vm_map_t mb_map;
  struct mbuf *mbutl;
diff --git a/usr/src/sys/kern/uipc_proto.c b/usr/src/sys/kern/uipc_proto.c

index 7287d8d..f6e0b04 100644 (file)
--- a/usr/src/sys/kern/uipc_proto.c
+++ b/usr/src/sys/kern/uipc_proto.c
@@ -4,14 +4,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_proto.c        7.6 (Berkeley) %G%
+ *     @(#)uipc_proto.c        7.7 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "socket.h"
-#include "protosw.h"
-#include "domain.h"
-#include "mbuf.h"
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/mbuf.h>
  
  /*
   * Definitions of protocols supported in the UNIX domain.
  
  /*
   * Definitions of protocols supported in the UNIX domain.
diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c

index f55bbe2..1fe0828 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -4,21 +4,21 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_socket.c       7.36 (Berkeley) %G%
+ *     @(#)uipc_socket.c       7.37 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "file.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "domain.h"
-#include "kernel.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/domain.h>
+#include <sys/kernel.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/resourcevar.h>
  
  /*
   * Socket operation routines.
  
  /*
   * Socket operation routines.
diff --git a/usr/src/sys/kern/uipc_socket2.c b/usr/src/sys/kern/uipc_socket2.c

index ad3d2df..b1a507b 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -4,19 +4,19 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_socket2.c      7.18 (Berkeley) %G%
+ *     @(#)uipc_socket2.c      7.19 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "file.h"
-#include "buf.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
  
  /*
   * Primitive routines for operating on sockets and socket buffers
  
  /*
   * Primitive routines for operating on sockets and socket buffers
diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c

index 70627b7..519ee1d 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -2,21 +2,21 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_syscalls.c     7.27 (Berkeley) %G%
+ *     @(#)uipc_syscalls.c     7.28 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "filedesc.h"
-#include "proc.h"
-#include "file.h"
-#include "buf.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
+#include <sys/param.h>
+#include <sys/filedesc.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c

index 4dd9ee0..c046d67 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -2,24 +2,24 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)uipc_usrreq.c       7.37 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       7.38 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "filedesc.h"
-#include "domain.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "unpcb.h"
-#include "un.h"
-#include "namei.h"
-#include "vnode.h"
-#include "file.h"
-#include "stat.h"
-#include "mbuf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/filedesc.h>
+#include <sys/domain.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/unpcb.h>
+#include <sys/un.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/mbuf.h>
  
  /*
   * Unix communications domain.
  
  /*
   * Unix communications domain.
diff --git a/usr/src/sys/kern/vfs_cache.c b/usr/src/sys/kern/vfs_cache.c

index 73491ee..1e989e9 100644 (file)
--- a/usr/src/sys/kern/vfs_cache.c
+++ b/usr/src/sys/kern/vfs_cache.c
@@ -4,17 +4,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)vfs_cache.c 7.15 (Berkeley) %G%
+ *     @(#)vfs_cache.c 7.16 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "time.h"
-#include "mount.h"
-#include "vnode.h"
-#include "namei.h"
-#include "errno.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/mount.h>
+#include <sys/vnode.h>
+#include <sys/namei.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
  
  /*
   * Name caching works as follows:
  
  /*
   * Name caching works as follows:
diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c

index d98d33f..d6be6ac 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -4,22 +4,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)vfs_lookup.c        7.44 (Berkeley) %G%
+ *     @(#)vfs_lookup.c        7.45 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "syslimits.h"
-#include "time.h"
-#include "namei.h"
-#include "vnode.h"
-#include "mount.h"
-#include "errno.h"
-#include "malloc.h"
-#include "filedesc.h"
-#include "proc.h"
+#include <sys/param.h>
+#include <sys/syslimits.h>
+#include <sys/time.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/filedesc.h>
+#include <sys/proc.h>
  
  #ifdef KTRACE
  
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c

index 22d858c..6eb63fd 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -4,22 +4,23 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)vfs_syscalls.c      7.99 (Berkeley) %G%
+ *     @(#)vfs_syscalls.c      7.100 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "namei.h"
-#include "filedesc.h"
-#include "kernel.h"
-#include "file.h"
-#include "stat.h"
-#include "vnode.h"
-#include "mount.h"
-#include "proc.h"
-#include "uio.h"
-#include "malloc.h"
-#include "dirent.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/malloc.h>
+#include <sys/dirent.h>
+
  #include <vm/vm.h>
  
  #ifdef REF_DIAGNOSTIC
  #include <vm/vm.h>
  
  #ifdef REF_DIAGNOSTIC
diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c

index e66b2ea..fc880fb 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -4,21 +4,22 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)vfs_vnops.c 7.45 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.46 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "file.h"
-#include "stat.h"
-#include "buf.h"
-#include "proc.h"
-#include "mount.h"
-#include "namei.h"
-#include "vnode.h"
-#include "ioctl.h"
-#include "tty.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+
  #include <vm/vm.h>
  
  struct         fileops vnops =
  #include <vm/vm.h>
  
  struct         fileops vnops =
diff --git a/usr/src/sys/libkern/locc.c b/usr/src/sys/libkern/locc.c

index b5ff502..a45d71d 100644 (file)
--- a/usr/src/sys/libkern/locc.c
+++ b/usr/src/sys/libkern/locc.c
@@ -4,10 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)locc.c      7.3 (Berkeley) %G%
+ *     @(#)locc.c      7.4 (Berkeley) %G%
   */
  
   */
  
-#include "libkern.h"
+#include <libkern/libkern.h>
  
  int
  locc(mask0, cp0, size)
  
  int
  locc(mask0, cp0, size)
diff --git a/usr/src/sys/libkern/random.c b/usr/src/sys/libkern/random.c

index 6c25d70..ad6cba1 100644 (file)
--- a/usr/src/sys/libkern/random.c
+++ b/usr/src/sys/libkern/random.c
@@ -4,10 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)random.c    7.1 (Berkeley) %G%
+ *     @(#)random.c    7.2 (Berkeley) %G%
   */
  
   */
  
-#include "libkern.h"
+#include <libkern/libkern.h>
  
  /*
   * Pseudo-random number generator for randomizing the profiling clock,
  
  /*
   * Pseudo-random number generator for randomizing the profiling clock,
diff --git a/usr/src/sys/libkern/scanc.c b/usr/src/sys/libkern/scanc.c

index 6b511a6..5cf7f4b 100644 (file)
--- a/usr/src/sys/libkern/scanc.c
+++ b/usr/src/sys/libkern/scanc.c
@@ -4,10 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)scanc.c     7.3 (Berkeley) %G%
+ *     @(#)scanc.c     7.4 (Berkeley) %G%
   */
  
   */
  
-#include "libkern.h"
+#include <libkern/libkern.h>
  
  int
  scanc(size, cp, table, mask0)
  
  int
  scanc(size, cp, table, mask0)
diff --git a/usr/src/sys/libkern/skpc.c b/usr/src/sys/libkern/skpc.c

index 822caf1..4ace60d 100644 (file)
--- a/usr/src/sys/libkern/skpc.c
+++ b/usr/src/sys/libkern/skpc.c
@@ -4,10 +4,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)skpc.c      7.3 (Berkeley) %G%
+ *     @(#)skpc.c      7.4 (Berkeley) %G%
   */
  
   */
  
-#include "libkern.h"
+#include <libkern/libkern.h>
  
  int
  skpc(mask0, size, cp0)
  
  int
  skpc(mask0, size, cp0)
diff --git a/usr/src/sys/luna68k/dev/dbgprf.c b/usr/src/sys/luna68k/dev/dbgprf.c

index 408123d..9c21a57 100644 (file)
--- a/usr/src/sys/luna68k/dev/dbgprf.c
+++ b/usr/src/sys/luna68k/dev/dbgprf.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dbgprf.c    7.1 (Berkeley) %G%
+ *     @(#)dbgprf.c    7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,10 +18,10 @@
  
  #ifdef DEBUGPRINT
  
  
  #ifdef DEBUGPRINT
  
-#include "sys/param.h"
-#include "sys/systm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
  
  
-#include "machine/stdarg.h"
+#include <machine/stdarg.h>
  
  static char *sprintn __P((u_long num, int base, int *len));
  
  
  static char *sprintn __P((u_long num, int base, int *len));
  
diff --git a/usr/src/sys/luna68k/dev/if_le.c b/usr/src/sys/luna68k/dev/if_le.c

index dce8611..9430a58 100644 (file)
--- a/usr/src/sys/luna68k/dev/if_le.c
+++ b/usr/src/sys/luna68k/dev/if_le.c
@@ -6,7 +6,7 @@
   *
   * from: hp300/dev/if_le.c     7.12 (Berkeley) 7/6/92
   *
   *
   * from: hp300/dev/if_le.c     7.12 (Berkeley) 7/6/92
   *
- *     @(#)if_le.c     7.2 (Berkeley) %G%
+ *     @(#)if_le.c     7.3 (Berkeley) %G%
   */
  
  #include "le.h"
   */
  
  #include "le.h"
@@ -22,45 +22,44 @@
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
-#include "sys/param.h"
-#include "sys/proc.h"
-#include "sys/systm.h"
-#include "sys/mbuf.h"
-#include "sys/buf.h"
-#include "sys/protosw.h"
-#include "sys/socket.h"
-#include "sys/syslog.h"
-#include "sys/ioctl.h"
-#include "sys/errno.h"
-
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #endif
  
-#include "../include/cpu.h"
-#include "../include/mtpr.h"
-#include "device.h"
-#include "if_lereg.h"
+#include <machine/cpu.h>
+#include <machine/mtpr.h>
+#include <luna68k/dev/device.h>
+#include <luna68k/dev/if_lereg.h>
  
  #if NBPFILTER > 0
  
  #if NBPFILTER > 0
-#include "../net/bpf.h"
-#include "../net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
  #endif
  
  #endif
  
-
  int    leattach();
  struct driver ledriver = {
         leattach, "le",
  int    leattach();
  struct driver ledriver = {
         leattach, "le",
diff --git a/usr/src/sys/luna68k/dev/if_lereg.h b/usr/src/sys/luna68k/dev/if_lereg.h

index 2a2039e..b858a9c 100644 (file)
--- a/usr/src/sys/luna68k/dev/if_lereg.h
+++ b/usr/src/sys/luna68k/dev/if_lereg.h
@@ -6,14 +6,10 @@
   *
   * from: hp300/dev/if_lereg.h  7.4 (Berkeley) 7/6/92
   *
   *
   * from: hp300/dev/if_lereg.h  7.4 (Berkeley) 7/6/92
   *
- *     @(#)if_lereg.h  7.2 (Berkeley) %G%
+ *     @(#)if_lereg.h  7.3 (Berkeley) %G%
   */
  
   */
  
-#ifdef KERNEL
-#include "iotypes.h"   /* XXX */
-#else
-#include <luna68k/dev/iotypes.h>       /* XXX */
-#endif
+#include <hp/dev/iotypes.h>    /* XXX */
  
  #define        LEID            21
  
  
  #define        LEID            21
  
diff --git a/usr/src/sys/luna68k/dev/sc.c b/usr/src/sys/luna68k/dev/sc.c

index 857f54a..14bfe2f 100644 (file)
--- a/usr/src/sys/luna68k/dev/sc.c
+++ b/usr/src/sys/luna68k/dev/sc.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sc.c        7.2 (Berkeley) %G%
+ *     @(#)sc.c        7.3 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -23,13 +23,13 @@
  #include "sc.h"
  #if NSC > 0
  
  #include "sc.h"
  #if NSC > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "device.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
  
  
-#include "scsireg.h"
-#include "scsivar.h"
+#include <luna68k/dev/device.h>
+#include <luna68k/dev/scsireg.h>
+#include <luna68k/dev/scsivar.h>
  
  /*
   * SC Driver Options
  
  /*
   * SC Driver Options
diff --git a/usr/src/sys/luna68k/dev/scsireg.h b/usr/src/sys/luna68k/dev/scsireg.h

index fffec1a..ce007b4 100644 (file)
--- a/usr/src/sys/luna68k/dev/scsireg.h
+++ b/usr/src/sys/luna68k/dev/scsireg.h
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)scsireg.h   7.1 (Berkeley) %G%
+ *     @(#)scsireg.h   7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -400,7 +400,7 @@ struct scsi_cache {
   * Driver ioctl's for various scsi operations.
   */
  #ifndef _IOCTL_
   * Driver ioctl's for various scsi operations.
   */
  #ifndef _IOCTL_
-#include "ioctl.h"
+#include <sys/ioctl.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/luna68k/dev/sd.c b/usr/src/sys/luna68k/dev/sd.c

index f1276bc..60586fb 100644 (file)
--- a/usr/src/sys/luna68k/dev/sd.c
+++ b/usr/src/sys/luna68k/dev/sd.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sd.c        7.3 (Berkeley) %G%
+ *     @(#)sd.c        7.4 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,16 +22,16 @@
  #include "sd.h"
  #if NSD > 0
  
  #include "sd.h"
  #if NSD > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/dkstat.h"
-#include "sys/proc.h"
-#include "sys/disklabel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/proc.h>
+#include <sys/disklabel.h>
  
  
-#include "device.h"
-#include "scsireg.h"
-#include "scsivar.h"
+#include <luna68k/dev/device.h>
+#include <luna68k/dev/scsireg.h>
+#include <luna68k/dev/scsivar.h>
  
  int    sdinit(), sdstrategy(), sdstart(), sdintr();
  
  
  int    sdinit(), sdstrategy(), sdstart(), sdintr();
  
diff --git a/usr/src/sys/luna68k/dev/sio.c b/usr/src/sys/luna68k/dev/sio.c

index b15c083..29f7695 100644 (file)
--- a/usr/src/sys/luna68k/dev/sio.c
+++ b/usr/src/sys/luna68k/dev/sio.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sio.c       7.1 (Berkeley) %G%
+ *     @(#)sio.c       7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -26,19 +26,19 @@
   *  uese NEC uPD7201A SIO
   */
  
   *  uese NEC uPD7201A SIO
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/proc.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
-#include "sys/file.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
  
  
-#include "device.h"
-#include "sioreg.h"
+#include <luna68k/dev/device.h>
+#include <luna68k/dev/sioreg.h>
  
  #define SIO_IPL                6
  
  
  #define SIO_IPL                6
  
@@ -437,7 +437,7 @@ siostop(tp, flag)
  /*
   * Following are all routines needed for SIO to act as console
   */
  /*
   * Following are all routines needed for SIO to act as console
   */
-#include "../luna68k/cons.h"
+#include <luna68k/luna68k/cons.h>
  
  siocnprobe(cp)
         struct consdev *cp;
  
  siocnprobe(cp)
         struct consdev *cp;
diff --git a/usr/src/sys/luna68k/dev/st.c b/usr/src/sys/luna68k/dev/st.c

index 0c04b5a..02a8307 100644 (file)
--- a/usr/src/sys/luna68k/dev/st.c
+++ b/usr/src/sys/luna68k/dev/st.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)st.c        7.3 (Berkeley) %G%
+ *     @(#)st.c        7.4 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,17 +22,17 @@
  #include "st.h"
  #if NST > 0
  
  #include "st.h"
  #if NST > 0
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/file.h"
-#include "sys/proc.h"
-#include "sys/mtio.h"
-#include "sys/tprintf.h"
-
-#include "device.h"
-#include "scsireg.h"
-#include "scsivar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/mtio.h>
+#include <sys/tprintf.h>
+
+#include <luna68k/dev/device.h>
+#include <luna68k/dev/scsireg.h>
+#include <luna68k/dev/scsivar.h>
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
  
  extern int scsi_test_unit_rdy();
  extern int scsi_request_sense();
diff --git a/usr/src/sys/luna68k/include/stinger.h b/usr/src/sys/luna68k/include/stinger.h

index b725731..3db8f5e 100644 (file)
--- a/usr/src/sys/luna68k/include/stinger.h
+++ b/usr/src/sys/luna68k/include/stinger.h
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)stinger.h   7.1 (Berkeley) %G%
+ *     @(#)stinger.h   7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,8 +18,8 @@
   * This file should be remade.
   */
  
   * This file should be remade.
   */
  
-#include "rdvar.h"
-#include "memory.h"
+#include <machine/rdvar.h>
+#include <machine/memory.h>
  
  struct KernInter {
         caddr_t   maxaddr;
  
  struct KernInter {
         caddr_t   maxaddr;
diff --git a/usr/src/sys/luna68k/luna68k/autoconf.c b/usr/src/sys/luna68k/luna68k/autoconf.c

index f0cae86..39684c6 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/autoconf.c
+++ b/usr/src/sys/luna68k/luna68k/autoconf.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)autoconf.c  7.1 (Berkeley) %G%
+ *     @(#)autoconf.c  7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -25,14 +25,14 @@
   * and the drivers are initialized.
   */
  
   * and the drivers are initialized.
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/dkstat.h"
-#include "sys/conf.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/dkstat.h>
+#include <sys/conf.h>
+#include <sys/reboot.h>
  
  
-#include "../include/cpu.h"
-#include "../dev/device.h"
+#include <machine/cpu.h>
+#include <luna68k/dev/device.h>
  
  /*
   * The following several variables are related to
  
  /*
   * The following several variables are related to
diff --git a/usr/src/sys/luna68k/luna68k/clock.c b/usr/src/sys/luna68k/luna68k/clock.c

index eba671a..9df0c38 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/clock.c
+++ b/usr/src/sys/luna68k/luna68k/clock.c
@@ -15,12 +15,13 @@
   *
   * from: hp300/hp300/clock.c    7.14 (Berkeley) 7/8/92
   *
   *
   * from: hp300/hp300/clock.c    7.14 (Berkeley) 7/8/92
   *
- *     @(#)clock.c     7.3 (Berkeley) %G%
+ *     @(#)clock.c     7.4 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "kernel.h"
-#include "clockreg.h"
+#include <sys/param.h>
+#include <sys/kernel.h>
+
+#include <luna68k/luna68k/clockreg.h>
  
  extern int clock_on;
  
  
  extern int clock_on;
  
diff --git a/usr/src/sys/luna68k/luna68k/clockreg.h b/usr/src/sys/luna68k/luna68k/clockreg.h

index 00732a2..d351415 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/clockreg.h
+++ b/usr/src/sys/luna68k/luna68k/clockreg.h
@@ -15,7 +15,7 @@
   *
   * from: hp300/hp300/clockreg.h        7.3 (Berkeley) 5/7/91
   *
   *
   * from: hp300/hp300/clockreg.h        7.3 (Berkeley) 5/7/91
   *
- *     @(#)clockreg.h  7.1 (Berkeley) %G%
+ *     @(#)clockreg.h  7.2 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -54,7 +54,7 @@ struct bbc_tm {
   * TIME KEEPER RAM -- (MK48T02/12(B)-12/15/20/25)
   */
  
   * TIME KEEPER RAM -- (MK48T02/12(B)-12/15/20/25)
   */
  
-#include "../dev/nvram.h"
+#include <luna68k/dev/nvram.h>
  
  struct bbc {
      struct nvram       nvram;          /* non-volatile RAM area */
  
  struct bbc {
      struct nvram       nvram;          /* non-volatile RAM area */
diff --git a/usr/src/sys/luna68k/luna68k/conf.c b/usr/src/sys/luna68k/luna68k/conf.c

index 7ddd993..535eff4 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/conf.c
+++ b/usr/src/sys/luna68k/luna68k/conf.c
@@ -7,16 +7,16 @@
   *
   * from: hp300/hp300/conf.c    7.13 (Berkeley) 7/9/92
   *
   *
   * from: hp300/hp300/conf.c    7.13 (Berkeley) 7/9/92
   *
- *     @(#)conf.c      7.2 (Berkeley) %G%
+ *     @(#)conf.c      7.3 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/proc.h"
-#include "sys/tty.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
diff --git a/usr/src/sys/luna68k/luna68k/cons.c b/usr/src/sys/luna68k/luna68k/cons.c

index 79f13c8..3429125 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/cons.c
+++ b/usr/src/sys/luna68k/luna68k/cons.c
@@ -14,19 +14,19 @@
   *
   * from: hp300/hp300/cons.c    7.1 (Berkeley) 6/4/92
   *
   *
   * from: hp300/hp300/cons.c    7.1 (Berkeley) 6/4/92
   *
- *     @(#)cons.c      7.1 (Berkeley) %G%
+ *     @(#)cons.c      7.2 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/proc.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/file.h"
-#include "sys/conf.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
  
  
-#include "cons.h"
+#include <luna68k/luna68k/cons.h>
  
  /* XXX - all this could be autoconfig()ed */
  #include "sio.h"
  
  /* XXX - all this could be autoconfig()ed */
  #include "sio.h"
diff --git a/usr/src/sys/luna68k/luna68k/genassym.c b/usr/src/sys/luna68k/luna68k/genassym.c

index 52081ea..f2c7536 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/genassym.c
+++ b/usr/src/sys/luna68k/luna68k/genassym.c
@@ -9,28 +9,30 @@
   *
   * from: hp300/hp300/genassym.c        7.11 (Berkeley) 7/8/92
   *
   *
   * from: hp300/hp300/genassym.c        7.11 (Berkeley) 7/8/92
   *
- *     @(#)genassym.c  7.2 (Berkeley) %G%
+ *     @(#)genassym.c  7.3 (Berkeley) %G%
   */
  
  #define KERNEL
  
   */
  
  #define KERNEL
  
-#include "sys/param.h"
-#include "sys/buf.h"
-#include "sys/map.h"
-#include "sys/proc.h"
-#include "sys/mbuf.h"
-#include "sys/msgbuf.h"
-#include "../include/cpu.h"
-#include "../include/trap.h"
-#include "../include/psl.h"
-#include "../include/reg.h"
-#include "../include/stinger.h"
-#include "../dev/pioreg.h"
-#include "clockreg.h"
-#include "sys/syscall.h"
-#include "vm/vm.h"
-#include "sys/user.h"
-#include "pte.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/syscall.h>
+#include <sys/user.h>
+
+#include <machine/cpu.h>
+#include <machine/trap.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <machine/stinger.h>
+
+#include <luna68k/dev/pioreg.h>
+#include <luna68k/luna68k/clockreg.h>
+#include <vm/vm.h>
+#include <luna68k/luna68k/pte.h>
  
  #include <errno.h>
  #include <stdio.h>
  
  #include <errno.h>
  #include <stdio.h>
diff --git a/usr/src/sys/luna68k/luna68k/locore.s b/usr/src/sys/luna68k/luna68k/locore.s

index 4b0996b..17d7848 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/locore.s
+++ b/usr/src/sys/luna68k/luna68k/locore.s
@@ -15,11 +15,11 @@
   *
   * from: hp300/hp300/locore.s   7.16 (Berkeley) 7/8/92
   *
   *
   * from: hp300/hp300/locore.s   7.16 (Berkeley) 7/8/92
   *
- *     @(#)locore.s    7.5 (Berkeley) %G%
+ *     @(#)locore.s    7.6 (Berkeley) %G%
   */
  
  #include "assym.s"
   */
  
  #include "assym.s"
-#include "vectors.s"
+#include <luna68k/luna68k/vectors.s>
  
         .text
  /*
  
         .text
  /*
diff --git a/usr/src/sys/luna68k/luna68k/machdep.c b/usr/src/sys/luna68k/luna68k/machdep.c

index 478d799..036614a 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/machdep.c
+++ b/usr/src/sys/luna68k/luna68k/machdep.c
@@ -15,40 +15,40 @@
   *
   * from: hp300/hp300/machdep.c  7.29 (Berkeley) 7/8/92
   *
   *
   * from: hp300/hp300/machdep.c  7.29 (Berkeley) 7/8/92
   *
- *     @(#)machdep.c   7.3 (Berkeley) %G%
+ *     @(#)machdep.c   7.4 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "signalvar.h"
-#include "kernel.h"
-#include "map.h"
-#include "proc.h"
-#include "buf.h"
-#include "reboot.h"
-#include "conf.h"
-#include "file.h"
-#include "clist.h"
-#include "callout.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "msgbuf.h"
-#include "mount.h"
-#include "user.h"
-#include "exec.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/reboot.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/clist.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/mount.h>
+#include <sys/user.h>
+#include <sys/exec.h>
  #ifdef SYSVSHM
  #ifdef SYSVSHM
-#include "shm.h"
+#include <sys/shm.h>
  #endif
  
  #endif
  
-#include "../include/cpu.h"
-#include "../include/reg.h"
-#include "../include/psl.h"
-#include "isr.h"
-#include "pte.h"
-#include "net/netisr.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <hp300/hp300/isr.h>
+#include <luna68k/luna68k/pte.h>
+#include <net/netisr.h>
  
  #define        MAXMEM  64*1024*CLSIZE  /* XXX - from cmap.h */
  
  #define        MAXMEM  64*1024*CLSIZE  /* XXX - from cmap.h */
-#include "vm/vm_kern.h"
+#include <vm/vm_kern.h>
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
  
  vm_map_t buffer_map;
  extern vm_offset_t avail_end;
diff --git a/usr/src/sys/luna68k/luna68k/pmap.c b/usr/src/sys/luna68k/luna68k/pmap.c

index f54360f..fd39dcf 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/pmap.c
+++ b/usr/src/sys/luna68k/luna68k/pmap.c
@@ -13,7 +13,7 @@
   *
   * from: hp300/hp300/pmap.c    7.11 (Berkeley) 7/12/92
   *
   *
   * from: hp300/hp300/pmap.c    7.11 (Berkeley) 7/12/92
   *
- *     @(#)pmap.c      7.2 (Berkeley) %G%
+ *     @(#)pmap.c      7.3 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -50,19 +50,19 @@
   *     and to when physical maps must be made correct.
   */
  
   *     and to when physical maps must be made correct.
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/user.h>
  
  
-#include "pte.h"
+#include <luna68k/luna68k/pte.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  #ifdef DEBUG
  struct {
  
  #ifdef DEBUG
  struct {
diff --git a/usr/src/sys/luna68k/luna68k/pmap_bootstrap.c b/usr/src/sys/luna68k/luna68k/pmap_bootstrap.c

index 8425e75..7ec16b7 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/pmap_bootstrap.c
+++ b/usr/src/sys/luna68k/luna68k/pmap_bootstrap.c
@@ -13,15 +13,15 @@
   *
   * from: hp300/hp300/pmap_bootstrap.c  7.1 (Berkeley) 6/5/92
   *
   *
   * from: hp300/hp300/pmap_bootstrap.c  7.1 (Berkeley) 6/5/92
   *
- *     @(#)pmap_bootstrap.c    7.1 (Berkeley) %G%
+ *     @(#)pmap_bootstrap.c    7.2 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "pte.h"
-#include "../include/vmparam.h"
-#include "../include/cpu.h"
+#include <sys/param.h>
+#include <luna68k/luna68k/pte.h>
+#include <machine/vmparam.h>
+#include <machine/cpu.h>
  
  
-#include "vm/vm.h"
+#include <vm/vm.h>
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
  
  /*
   * Allocate various and sundry SYSMAPs used in the days of old VM
@@ -46,7 +46,7 @@ extern int lunapagesperpage;
  #endif
  
  #if BSDVM_COMPAT
  #endif
  
  #if BSDVM_COMPAT
-#include "msgbuf.h"
+#include <sys/msgbuf.h>
  
  /*
   * All those kernel PT submaps that BSD is so fond of
  
  /*
   * All those kernel PT submaps that BSD is so fond of
diff --git a/usr/src/sys/luna68k/luna68k/swapgeneric.c b/usr/src/sys/luna68k/luna68k/swapgeneric.c

index 68d349d..e8682ba 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/swapgeneric.c
+++ b/usr/src/sys/luna68k/luna68k/swapgeneric.c
@@ -7,16 +7,16 @@
   *
   * from: hp300/hp300/swapgeneric.c     7.1 (Berkeley) 6/4/92
   *
   *
   * from: hp300/hp300/swapgeneric.c     7.1 (Berkeley) 6/4/92
   *
- *     @(#)swapgeneric.c       7.1 (Berkeley) %G%
+ *     @(#)swapgeneric.c       7.2 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/conf.h"
-#include "sys/buf.h"
-#include "sys/systm.h"
-#include "sys/reboot.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/reboot.h>
  
  
-#include "../dev/device.h"
+#include <luna68k/dev/device.h>
  
  /*
   * Generic configuration;  all in one
  
  /*
   * Generic configuration;  all in one
diff --git a/usr/src/sys/luna68k/luna68k/sys_machdep.c b/usr/src/sys/luna68k/luna68k/sys_machdep.c

index 8de929c..c4b59e8 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/sys_machdep.c
+++ b/usr/src/sys/luna68k/luna68k/sys_machdep.c
@@ -9,21 +9,21 @@
   *
   * from: hp300/hp300/sys_machdep.c     7.8 (Berkeley) 6/5/92
   *
   *
   * from: hp300/hp300/sys_machdep.c     7.8 (Berkeley) 6/5/92
   *
- *     @(#)sys_machdep.c       7.1 (Berkeley) %G%
+ *     @(#)sys_machdep.c       7.2 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/file.h"
-#include "sys/time.h"
-#include "sys/proc.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/mtio.h"
-#include "sys/buf.h"
-#include "sys/trace.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/mtio.h>
+#include <sys/buf.h>
+#include <sys/trace.h>
+#include <vm/vm.h>
  
  #ifdef TRACE
  int    nvualarm;
  
  #ifdef TRACE
  int    nvualarm;
@@ -80,7 +80,7 @@ vdoualarm(arg)
  }
  #endif
  
  }
  #endif
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  /* XXX should be in an include file somewhere */
  #define CC_PURGE       1
  
  /* XXX should be in an include file somewhere */
  #define CC_PURGE       1
diff --git a/usr/src/sys/luna68k/luna68k/trap.c b/usr/src/sys/luna68k/luna68k/trap.c

index ce0ca25..1589ec1 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/trap.c
+++ b/usr/src/sys/luna68k/luna68k/trap.c
@@ -15,31 +15,31 @@
   *
   * from: hp300/hp300/trap.c     7.23 (Berkeley) 7/9/92
   *
   *
   * from: hp300/hp300/trap.c     7.23 (Berkeley) 7/9/92
   *
- *     @(#)trap.c      7.2 (Berkeley) %G%
+ *     @(#)trap.c      7.3 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "acct.h"
-#include "kernel.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "syscall.h"
-#include "syslog.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/acct.h>
+#include <sys/kernel.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/syscall.h>
+#include <sys/syslog.h>
+#include <sys/user.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  
  #endif
  
-#include "../include/psl.h"
-#include "../include/trap.h"
-#include "../include/cpu.h"
-#include "../include/reg.h"
-#include "../include/mtpr.h"
+#include <machine/psl.h>
+#include <machine/trap.h>
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/mtpr.h>
  
  
-#include "vm/vm.h"
-#include "vm/pmap.h"
+#include <vm/vm.h>
+#include <vm/pmap.h>
  
  struct sysent  sysent[];
  int    nsysent;
  
  struct sysent  sysent[];
  int    nsysent;
diff --git a/usr/src/sys/luna68k/luna68k/vm_machdep.c b/usr/src/sys/luna68k/luna68k/vm_machdep.c

index 67b28b8..ef860d8 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/vm_machdep.c
+++ b/usr/src/sys/luna68k/luna68k/vm_machdep.c
@@ -15,22 +15,22 @@
   *
   * from: hp300/hp300/vm_machdep.c      7.12 (Berkeley) 6/5/92
   *
   *
   * from: hp300/hp300/vm_machdep.c      7.12 (Berkeley) 6/5/92
   *
- *     @(#)vm_machdep.c        7.1 (Berkeley) %G%
+ *     @(#)vm_machdep.c        7.2 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "buf.h"
-#include "vnode.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/user.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "pte.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <pte.h>
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
diff --git a/usr/src/sys/pmax/dev/asc.c b/usr/src/sys/pmax/dev/asc.c

index 7102350..2caedb0 100644 (file)
--- a/usr/src/sys/pmax/dev/asc.c
+++ b/usr/src/sys/pmax/dev/asc.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)asc.c       7.4 (Berkeley) %G%
+ *     @(#)asc.c       7.5 (Berkeley) %G%
   */
  
  /* 
   */
  
  /* 
@@ -94,16 +94,16 @@
  #include "asc.h"
  #if NASC > 0
  
  #include "asc.h"
  #if NASC > 0
  
-#include "param.h"
-#include "systm.h"
-#include "dkstat.h"
-#include "buf.h"
-#include "conf.h"
-#include "errno.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/dkstat.h>
+#include <sys/buf.h>
+#include <sys/conf.h>
+#include <sys/errno.h>
  
  
-#include "device.h"
-#include "scsi.h"
-#include "ascreg.h"
+#include <mips/dev/device.h>
+#include <mips/dev/scsi.h>
+#include <mips/dev/ascreg.h>
  
  #define ASC_OFFSET_53C94       0x0             /* from module base */
  #define ASC_OFFSET_DMAR                0x40000         /* DMA Address Register */
  
  #define ASC_OFFSET_53C94       0x0             /* from module base */
  #define ASC_OFFSET_DMAR                0x40000         /* DMA Address Register */
diff --git a/usr/src/sys/pmax/dev/cfb.c b/usr/src/sys/pmax/dev/cfb.c

index 483c88b..7cd4e33 100644 (file)
--- a/usr/src/sys/pmax/dev/cfb.c
+++ b/usr/src/sys/pmax/dev/cfb.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)cfb.c       7.2 (Berkeley) %G%
+ *     @(#)cfb.c       7.3 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -62,24 +62,25 @@
   *     it will need changes to work with X11R5.
   */
  
   *     it will need changes to work with X11R5.
   */
  
-#include "param.h"
-#include "time.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "file.h"
-#include "errno.h"
-#include "proc.h"
-#include "mman.h"
-#include "vm/vm.h"
-
-#include "machine/machConst.h"
-#include "machine/machMon.h"
-#include "machine/dc7085cons.h"
-#include "machine/pmioctl.h"
-
-#include "device.h"
-#include "cfbreg.h"
-#include "font.c"
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include <sys/mman.h>
+
+#include <vm/vm.h>
+
+#include <machine/machConst.h>
+#include <machine/machMon.h>
+#include <machine/dc7085cons.h>
+#include <machine/pmioctl.h>
+
+#include <mips/dev/device.h>
+#include <mips/dev/cfbreg.h>
+#include <mips/dev/font.c>
  
  #define MAX_ROW        56
  #define MAX_COL        80
  
  #define MAX_ROW        56
  #define MAX_COL        80
diff --git a/usr/src/sys/pmax/dev/dc.c b/usr/src/sys/pmax/dev/dc.c

index d3dbcb9..cb22e60 100644 (file)
--- a/usr/src/sys/pmax/dev/dc.c
+++ b/usr/src/sys/pmax/dev/dc.c
@@ -12,7 +12,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dc.c        7.8 (Berkeley) %G%
+ *     @(#)dc.c        7.9 (Berkeley) %G%
   *
   * devDC7085.c --
   *
   *
   * devDC7085.c --
   *
@@ -36,23 +36,23 @@
  /*
   * DC7085 (DZ-11 look alike) Driver
   */
  /*
   * DC7085 (DZ-11 look alike) Driver
   */
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "map.h"
-#include "buf.h"
-#include "conf.h"
-#include "file.h"
-#include "uio.h"
-#include "kernel.h"
-#include "syslog.h"
-
-#include "machine/dc7085cons.h"
-
-#include "device.h"
-#include "pdma.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/proc.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <machine/dc7085cons.h>
+
+#include <mips/dev/device.h>
+#include <mips/dev/pdma.h>
  
  /*
   * Driver information for auto-configuration stuff.
  
  /*
   * Driver information for auto-configuration stuff.
diff --git a/usr/src/sys/pmax/dev/if_le.c b/usr/src/sys/pmax/dev/if_le.c

index bc25a76..193ce44 100644 (file)
--- a/usr/src/sys/pmax/dev/if_le.c
+++ b/usr/src/sys/pmax/dev/if_le.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)if_le.c     7.5 (Berkeley) %G%
+ *     @(#)if_le.c     7.6 (Berkeley) %G%
   */
  
  #include "le.h"
   */
  
  #include "le.h"
@@ -23,45 +23,45 @@
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
   * with VAXen, SUNs, and others that handle and benefit from them.
   * This reasoning is dubious.
   */
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "syslog.h"
-#include "ioctl.h"
-#include "errno.h"
-
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
  
  #ifdef INET
  
  #ifdef INET
-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>
  #endif
  
  #ifdef NS
  #endif
  
  #ifdef NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
  #endif
  
  #ifdef RMP
  #endif
  
  #ifdef RMP
-#include "netrmp/rmp.h"
-#include "netrmp/rmp_var.h"
+#include <netrmp/rmp.h>
+#include <netrmp/rmp_var.h>
  #endif
  
  #endif
  
-#include "machine/machConst.h"
-#include "device.h"
-#include "if_lereg.h"
+#include <machine/machConst.h>
+#include <mips/dev/device.h>
+#include <mips/dev/if_lereg.h>
  
  #if NBPFILTER > 0
  
  #if NBPFILTER > 0
-#include "../net/bpf.h"
-#include "../net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
  #endif
  
  int    leprobe();
  #endif
  
  int    leprobe();
diff --git a/usr/src/sys/pmax/dev/pm.c b/usr/src/sys/pmax/dev/pm.c

index 8dc7551..45ad0cd 100644 (file)
--- a/usr/src/sys/pmax/dev/pm.c
+++ b/usr/src/sys/pmax/dev/pm.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pm.c        7.5 (Berkeley) %G%
+ *     @(#)pm.c        7.6 (Berkeley) %G%
   *
   *  devGraphics.c --
   *
   *
   *  devGraphics.c --
   *
@@ -28,24 +28,25 @@
  #include "pm.h"
  #if NPM > 0
  
  #include "pm.h"
  #if NPM > 0
  
-#include "param.h"
-#include "time.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "file.h"
-#include "errno.h"
-#include "proc.h"
-#include "mman.h"
-#include "vm/vm.h"
-
-#include "machine/machConst.h"
-#include "machine/machMon.h"
-#include "machine/dc7085cons.h"
-#include "machine/pmioctl.h"
-
-#include "device.h"
-#include "pmreg.h"
-#include "font.c"
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include <sys/mman.h>
+
+#include <vm/vm.h>
+
+#include <machine/machConst.h>
+#include <machine/machMon.h>
+#include <machine/dc7085cons.h>
+#include <machine/pmioctl.h>
+
+#include <mips/dev/device.h>
+#include <mips/dev/pmreg.h>
+#include <mips/dev/font.c>
  
  #define MAX_ROW        56
  #define MAX_COL        80
  
  #define MAX_ROW        56
  #define MAX_COL        80
diff --git a/usr/src/sys/pmax/dev/rz.c b/usr/src/sys/pmax/dev/rz.c

index c5d4785..c236722 100644 (file)
--- a/usr/src/sys/pmax/dev/rz.c
+++ b/usr/src/sys/pmax/dev/rz.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)rz.c        7.5 (Berkeley) %G%
+ *     @(#)rz.c        7.6 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -18,23 +18,24 @@
  #include "rz.h"
  #if NRZ > 0
  
  #include "rz.h"
  #if NRZ > 0
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "errno.h"
-#include "fcntl.h"
-#include "ioctl.h"
-#include "dkstat.h"
-#include "disklabel.h"
-#include "malloc.h"
-#include "proc.h"
-#include "uio.h"
-#include "stat.h"
-#include "syslog.h"
-#include "ufs/ffs/fs.h"
-
-#include "device.h"
-#include "scsi.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/errno.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/dkstat.h>
+#include <sys/disklabel.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/stat.h>
+#include <sys/syslog.h>
+
+#include <ufs/ffs/fs.h>
+
+#include <mips/dev/device.h>
+#include <mips/dev/scsi.h>
  
  extern int splbio();
  extern void splx();
  
  extern int splbio();
  extern void splx();
diff --git a/usr/src/sys/pmax/dev/scsi.c b/usr/src/sys/pmax/dev/scsi.c

index 299b2e0..8788408 100644 (file)
--- a/usr/src/sys/pmax/dev/scsi.c
+++ b/usr/src/sys/pmax/dev/scsi.c
@@ -7,17 +7,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)scsi.c      7.2 (Berkeley) %G%
+ *     @(#)scsi.c      7.3 (Berkeley) %G%
   */
  
  /*
   * SCSI utility routines for making SCSI device drivers easier.
   */
  
   */
  
  /*
   * SCSI utility routines for making SCSI device drivers easier.
   */
  
-#include "param.h"
+#include <sys/param.h>
  
  
-#include "device.h"
-#include "scsi.h"
+#include <mips/dev/device.h>
+#include <mips/dev/scsi.h>
  
  /*
   * The error codes for class 0-6 sense data are class specific.
  
  /*
   * The error codes for class 0-6 sense data are class specific.
diff --git a/usr/src/sys/pmax/dev/scsi.h b/usr/src/sys/pmax/dev/scsi.h

index e394708..8e367ab 100644 (file)
--- a/usr/src/sys/pmax/dev/scsi.h
+++ b/usr/src/sys/pmax/dev/scsi.h
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)scsi.h      7.2 (Berkeley) %G%
+ *     @(#)scsi.h      7.3 (Berkeley) %G%
   *
   * scsi.h --
   *
   *
   * scsi.h --
   *
@@ -484,7 +484,7 @@ typedef struct ScsiTapeModeSelectHdr {
   * Driver ioctl's for various scsi operations.
   */
  #ifndef _IOCTL_
   * Driver ioctl's for various scsi operations.
   */
  #ifndef _IOCTL_
-#include "ioctl.h"
+#include <sys/ioctl.h>
  #endif
  
  /*
  #endif
  
  /*
diff --git a/usr/src/sys/pmax/dev/sii.c b/usr/src/sys/pmax/dev/sii.c

index c6428f7..cc8b7a5 100644 (file)
--- a/usr/src/sys/pmax/dev/sii.c
+++ b/usr/src/sys/pmax/dev/sii.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sii.c       7.4 (Berkeley) %G%
+ *     @(#)sii.c       7.5 (Berkeley) %G%
   *
   * from: $Header: /sprite/src/kernel/dev/ds3100.md/RCS/devSII.c,
   *     v 9.2 89/09/14 13:37:41 jhh Exp $ SPRITE (DECWRL)";
   *
   * from: $Header: /sprite/src/kernel/dev/ds3100.md/RCS/devSII.c,
   *     v 9.2 89/09/14 13:37:41 jhh Exp $ SPRITE (DECWRL)";
@@ -18,17 +18,17 @@
  /*
   * SCSI interface driver
   */
  /*
   * SCSI interface driver
   */
-#include "param.h"
-#include "systm.h"
-#include "dkstat.h"
-#include "buf.h"
-#include "conf.h"
-#include "errno.h"
-
-#include "machine/machConst.h"
-#include "device.h"
-#include "scsi.h"
-#include "siireg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/dkstat.h>
+#include <sys/buf.h>
+#include <sys/conf.h>
+#include <sys/errno.h>
+
+#include <machine/machConst.h>
+#include <mips/dev/device.h>
+#include <mips/dev/scsi.h>
+#include <mips/dev/siireg.h>
  
  int    siiprobe();
  void   siistart();
  
  int    siiprobe();
  void   siistart();
diff --git a/usr/src/sys/pmax/dev/tz.c b/usr/src/sys/pmax/dev/tz.c

index 0868238..44f75fe 100644 (file)
--- a/usr/src/sys/pmax/dev/tz.c
+++ b/usr/src/sys/pmax/dev/tz.c
@@ -7,7 +7,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)tz.c        7.5 (Berkeley) %G%
+ *     @(#)tz.c        7.6 (Berkeley) %G%
   *
   * from: $Header: /sprite/src/kernel/dev/RCS/devSCSITape.c,
   *     v 8.14 89/07/31 17:26:13 mendel Exp $ SPRITE (Berkeley)
   *
   * from: $Header: /sprite/src/kernel/dev/RCS/devSCSITape.c,
   *     v 8.14 89/07/31 17:26:13 mendel Exp $ SPRITE (Berkeley)
@@ -19,18 +19,18 @@
  #include "tz.h"
  #if NTZ > 0
  
  #include "tz.h"
  #if NTZ > 0
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "errno.h"
-#include "file.h"
-#include "ioctl.h"
-#include "mtio.h"
-#include "syslog.h"
-#include "tprintf.h"
-
-#include "device.h"
-#include "scsi.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/errno.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mtio.h>
+#include <sys/syslog.h>
+#include <sys/tprintf.h>
+
+#include <mips/dev/device.h>
+#include <mips/dev/scsi.h>
  
  int    tzprobe();
  void   tzstart(), tzdone();
  
  int    tzprobe();
  void   tzstart(), tzdone();
diff --git a/usr/src/sys/pmax/include/cpu.h b/usr/src/sys/pmax/include/cpu.h

index 10d2cd1..654bf34 100644 (file)
--- a/usr/src/sys/pmax/include/cpu.h
+++ b/usr/src/sys/pmax/include/cpu.h
@@ -7,13 +7,13 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)cpu.h       7.4 (Berkeley) %G%
+ *     @(#)cpu.h       7.5 (Berkeley) %G%
   */
  
  #ifndef _CPU_H_
  #define _CPU_H_
  
   */
  
  #ifndef _CPU_H_
  #define _CPU_H_
  
-#include "machConst.h"
+#include <machine/machConst.h>
  
  /*
   * Exported definitions unique to pmax/mips cpu support.
  
  /*
   * Exported definitions unique to pmax/mips cpu support.
diff --git a/usr/src/sys/pmax/include/psl.h b/usr/src/sys/pmax/include/psl.h

index 360e7d6..0f3da7f 100644 (file)
--- a/usr/src/sys/pmax/include/psl.h
+++ b/usr/src/sys/pmax/include/psl.h
@@ -7,10 +7,10 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)psl.h       7.1 (Berkeley) %G%
+ *     @(#)psl.h       7.2 (Berkeley) %G%
   */
  
   */
  
-#include "machConst.h"
+#include <machine/machConst.h>
  
  #define        PSL_LOWIPL      (MACH_INT_MASK | MACH_SR_INT_ENA_CUR)
  
  
  #define        PSL_LOWIPL      (MACH_INT_MASK | MACH_SR_INT_ENA_CUR)
  
diff --git a/usr/src/sys/pmax/pmax/OLD/Locore.c b/usr/src/sys/pmax/pmax/OLD/Locore.c

index 1f6e9c5..6f89c35 100644 (file)
--- a/usr/src/sys/pmax/pmax/OLD/Locore.c
+++ b/usr/src/sys/pmax/pmax/OLD/Locore.c
@@ -4,23 +4,23 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)Locore.c    7.1 (Berkeley) %G%
+ *     @(#)Locore.c    7.2 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "user.h"
-#include "vm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "buf.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "domain.h"
-#include "map.h"
-
-#include "pte.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/user.h>
+#include <sys/vm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/map.h>
+
+#include <machine/pte.h>
  
  /*
   * Pseudo file for lint to show what is used/defined in locore.s.
  
  /*
   * Pseudo file for lint to show what is used/defined in locore.s.
diff --git a/usr/src/sys/pmax/pmax/autoconf.c b/usr/src/sys/pmax/pmax/autoconf.c

index 764d761..69a0d83 100644 (file)
--- a/usr/src/sys/pmax/pmax/autoconf.c
+++ b/usr/src/sys/pmax/pmax/autoconf.c
@@ -11,7 +11,7 @@
   *
   * from: Utah $Hdr: autoconf.c 1.31 91/01/21$
   *
   *
   * from: Utah $Hdr: autoconf.c 1.31 91/01/21$
   *
- *     @(#)autoconf.c  7.4 (Berkeley) %G%
+ *     @(#)autoconf.c  7.5 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -22,17 +22,17 @@
   * and the drivers are initialized.
   */
  
   * and the drivers are initialized.
   */
  
-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "buf.h"
-#include "dkstat.h"
-#include "conf.h"
-#include "dmap.h"
-#include "reboot.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/conf.h>
+#include <sys/dmap.h>
+#include <sys/reboot.h>
  
  
-#include "../include/cpu.h"
-#include "../dev/device.h"
+#include <machine/cpu.h>
+#include <pmax/dev/device.h>
  
  /*
   * The following several variables are related to
  
  /*
   * The following several variables are related to
diff --git a/usr/src/sys/pmax/pmax/clock.c b/usr/src/sys/pmax/pmax/clock.c

index a1fe775..a7b3ecc 100644 (file)
--- a/usr/src/sys/pmax/pmax/clock.c
+++ b/usr/src/sys/pmax/pmax/clock.c
@@ -11,14 +11,14 @@
   *
   * from: Utah $Hdr: clock.c 1.18 91/01/21$
   *
   *
   * from: Utah $Hdr: clock.c 1.18 91/01/21$
   *
- *     @(#)clock.c     7.4 (Berkeley) %G%
+ *     @(#)clock.c     7.5 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/kernel.h>
  
  
-#include "../include/machConst.h"
-#include "clockreg.h"
+#include <machine/machConst.h>
+#include <pmax/pmax/clockreg.h>
  
  /*
   * Machine-dependent clock routines.
  
  /*
   * Machine-dependent clock routines.
diff --git a/usr/src/sys/pmax/pmax/conf.c b/usr/src/sys/pmax/pmax/conf.c

index fdf8169..502eb77 100644 (file)
--- a/usr/src/sys/pmax/pmax/conf.c
+++ b/usr/src/sys/pmax/pmax/conf.c
@@ -7,15 +7,15 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)conf.c      7.3 (Berkeley) %G%
+ *     @(#)conf.c      7.4 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "conf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
  
  int    rawread         __P((dev_t, struct uio *, int));
  int    rawwrite        __P((dev_t, struct uio *, int));
diff --git a/usr/src/sys/pmax/pmax/cons.c b/usr/src/sys/pmax/pmax/cons.c

index 9ad588f..b352f14 100644 (file)
--- a/usr/src/sys/pmax/pmax/cons.c
+++ b/usr/src/sys/pmax/pmax/cons.c
@@ -11,19 +11,19 @@
   *
   * from: Utah $Hdr: cons.c 1.1 90/07/09$
   *
   *
   * from: Utah $Hdr: cons.c 1.1 90/07/09$
   *
- *     @(#)cons.c      7.3 (Berkeley) %G%
+ *     @(#)cons.c      7.4 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "proc.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "file.h"
-#include "conf.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
  
  
-#include "../include/machMon.h"
+#include <machine/machMon.h>
  
  /*
   * Console output may be redirected to another tty
  
  /*
   * Console output may be redirected to another tty
@@ -40,8 +40,8 @@ cngetc()
         int (*f)();
  #include "dc.h"
  #if NDC > 0
         int (*f)();
  #include "dc.h"
  #if NDC > 0
-#include "machine/dc7085cons.h"
-#include "../dev/pdma.h"
+#include <machine/dc7085cons.h>
+#include <pmax/dev/pdma.h>
         extern struct pdma dcpdma[];
  
         /* check to be sure device has been initialized */
         extern struct pdma dcpdma[];
  
         /* check to be sure device has been initialized */
diff --git a/usr/src/sys/pmax/pmax/fp.s b/usr/src/sys/pmax/pmax/fp.s

index 397d61b..7ab7441 100644 (file)
--- a/usr/src/sys/pmax/pmax/fp.s
+++ b/usr/src/sys/pmax/pmax/fp.s
@@ -7,16 +7,17 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)fp.s        7.2 (Berkeley) %G%
+ *     @(#)fp.s        7.3 (Berkeley) %G%
   */
  
  /*
   * Standard header stuff.
   */
  
   */
  
  /*
   * Standard header stuff.
   */
  
-#include "machine/regdef.h"
-#include "machine/machAsmDefs.h"
-#include "machine/machConst.h"
+#include <machine/regdef.h>
+#include <machine/machAsmDefs.h>
+#include <machine/machConst.h>
+
  #include "assym.h"
  
  #define SEXP_INF       0xff
  #include "assym.h"
  
  #define SEXP_INF       0xff
diff --git a/usr/src/sys/pmax/pmax/genassym.c b/usr/src/sys/pmax/pmax/genassym.c

index c7a69e7..0391495 100644 (file)
--- a/usr/src/sys/pmax/pmax/genassym.c
+++ b/usr/src/sys/pmax/pmax/genassym.c
@@ -7,19 +7,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)genassym.c  7.2 (Berkeley) %G%
+ *     @(#)genassym.c  7.3 (Berkeley) %G%
   */
  
  #define KERNEL
  
   */
  
  #define KERNEL
  
-#include "param.h"
-#include "buf.h"
-#include "map.h"
-#include "proc.h"
-#include "mbuf.h"
-#include "user.h"
-#include "machine/reg.h"
-#include "machine/pmap.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/mbuf.h>
+#include <sys/user.h>
+
+#include <machine/reg.h>
+#include <machine/pmap.h>
  
  main()
  {
  
  main()
  {
diff --git a/usr/src/sys/pmax/pmax/kadb.c b/usr/src/sys/pmax/pmax/kadb.c

index 3a950bc..c2d6c91 100644 (file)
--- a/usr/src/sys/pmax/pmax/kadb.c
+++ b/usr/src/sys/pmax/pmax/kadb.c
@@ -7,18 +7,18 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)kadb.c      7.4 (Berkeley) %G%
+ *     @(#)kadb.c      7.5 (Berkeley) %G%
   */
  
  /*
   * Define machine dependent primitives for kdb.
   */
  
   */
  
  /*
   * Define machine dependent primitives for kdb.
   */
  
-#include "kdb/defs.h"
+#include <kdb/defs.h>
  #undef SP
  #undef SP
-#include "machine/reg.h"
-#include "machine/trap.h"
-#include "machine/mips_opcode.h"
+#include <machine/reg.h>
+#include <machine/trap.h>
+#include <machine/mips_opcode.h>
  
  REGLIST        kdbreglist[] = {
         /* register_name, address */
  
  REGLIST        kdbreglist[] = {
         /* register_name, address */
diff --git a/usr/src/sys/pmax/pmax/locore.s b/usr/src/sys/pmax/pmax/locore.s

index 8a92b26..4f952af 100644 (file)
--- a/usr/src/sys/pmax/pmax/locore.s
+++ b/usr/src/sys/pmax/pmax/locore.s
@@ -22,7 +22,7 @@
   * from: $Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
   *     v 1.1 89/07/10 14:27:41 nelson Exp $ SPRITE (DECWRL)
   *
   * from: $Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s,
   *     v 1.1 89/07/10 14:27:41 nelson Exp $ SPRITE (DECWRL)
   *
- *     @(#)locore.s    7.8 (Berkeley) %G%
+ *     @(#)locore.s    7.9 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -30,14 +30,15 @@
   *     assembly language support routines.
   */
  
   *     assembly language support routines.
   */
  
-#include "errno.h"
+#include <sys/errno.h>
+
+#include <machine/param.h>
+#include <machine/vmparam.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <machine/machAsmDefs.h>
+#include <machine/pte.h>
  
  
-#include "machine/param.h"
-#include "machine/vmparam.h"
-#include "machine/psl.h"
-#include "machine/reg.h"
-#include "machine/machAsmDefs.h"
-#include "machine/pte.h"
  #include "assym.h"
  
  /*
  #include "assym.h"
  
  /*
diff --git a/usr/src/sys/pmax/pmax/machdep.c b/usr/src/sys/pmax/pmax/machdep.c

index 6110797..8df3444 100644 (file)
--- a/usr/src/sys/pmax/pmax/machdep.c
+++ b/usr/src/sys/pmax/pmax/machdep.c
@@ -10,44 +10,44 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)machdep.c   7.9 (Berkeley) %G%
+ *     @(#)machdep.c   7.10 (Berkeley) %G%
   */
  
  /* from: Utah $Hdr: machdep.c 1.63 91/04/24$ */
  
   */
  
  /* from: Utah $Hdr: machdep.c 1.63 91/04/24$ */
  
-#include "param.h"
-#include "systm.h"
-#include "signalvar.h"
-#include "kernel.h"
-#include "map.h"
-#include "proc.h"
-#include "buf.h"
-#include "reboot.h"
-#include "conf.h"
-#include "file.h"
-#include "clist.h"
-#include "callout.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "msgbuf.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/signalvar.h>
+#include <sys/kernel.h>
+#include <sys/map.h>
+#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/reboot.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/clist.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/msgbuf.h>
+#include <sys/user.h>
  #ifdef SYSVSHM
  #ifdef SYSVSHM
-#include "shm.h"
+#include <sys/shm.h>
  #endif
  
  #endif
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-#include "../include/cpu.h"
-#include "../include/reg.h"
-#include "../include/psl.h"
-#include "../include/machMon.h"
-#include "../include/pte.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <machine/machMon.h>
+#include <machine/pte.h>
  
  
-#include "../dev/device.h"
+#include <pmax/dev/device.h>
  
  
-#include "clockreg.h"
+#include <pmax/pmax/clockreg.h>
  
  vm_map_t buffer_map;
  
  
  vm_map_t buffer_map;
  
@@ -987,7 +987,7 @@ out:
   * rights to redistribute these changes.
   */
  
   * rights to redistribute these changes.
   */
  
-#include "turbochannel.h"
+#include <pmax/pmax/turbochannel.h>
  
  /*
   * Driver map: associates a device driver to an option type.
  
  /*
   * Driver map: associates a device driver to an option type.
diff --git a/usr/src/sys/pmax/pmax/mem.c b/usr/src/sys/pmax/pmax/mem.c

index f9d5b20..ffe1bc4 100644 (file)
--- a/usr/src/sys/pmax/pmax/mem.c
+++ b/usr/src/sys/pmax/pmax/mem.c
@@ -11,25 +11,25 @@
   *
   * from: Utah $Hdr: mem.c 1.14 90/10/12$
   *
   *
   * from: Utah $Hdr: mem.c 1.14 90/10/12$
   *
- *     @(#)mem.c       7.5 (Berkeley) %G%
+ *     @(#)mem.c       7.6 (Berkeley) %G%
   */
  
  /*
   * Memory special file
   */
  
   */
  
  /*
   * Memory special file
   */
  
-#include "param.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
  
  
-#include "../include/cpu.h"
+#include <machine/cpu.h>
  
  
-#include "vm/vm_param.h"
-#include "vm/lock.h"
-#include "vm/vm_prot.h"
-#include "vm/pmap.h"
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/vm_prot.h>
+#include <vm/pmap.h>
  
  /*ARGSUSED*/
  mmrw(dev, uio, flags)
  
  /*ARGSUSED*/
  mmrw(dev, uio, flags)
diff --git a/usr/src/sys/pmax/pmax/pmap.c b/usr/src/sys/pmax/pmax/pmap.c

index 13f3653..6fe02c7 100644 (file)
--- a/usr/src/sys/pmax/pmax/pmap.c
+++ b/usr/src/sys/pmax/pmax/pmap.c
@@ -8,7 +8,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)pmap.c      7.10 (Berkeley) %G%
+ *     @(#)pmap.c      7.11 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
@@ -37,17 +37,17 @@
   *     and to when physical maps must be made correct.
   */
  
   *     and to when physical maps must be made correct.
   */
  
-#include "param.h"
-#include "proc.h"
-#include "malloc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/user.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-#include "../include/machConst.h"
-#include "../include/pte.h"
+#include <machine/machConst.h>
+#include <machine/pte.h>
  
  /*
   * For each vm_page_t, there is a list of all currently valid virtual
  
  /*
   * For each vm_page_t, there is a list of all currently valid virtual
diff --git a/usr/src/sys/pmax/pmax/swapgeneric.c b/usr/src/sys/pmax/pmax/swapgeneric.c

index c30b640..fa1ee6f 100644 (file)
--- a/usr/src/sys/pmax/pmax/swapgeneric.c
+++ b/usr/src/sys/pmax/pmax/swapgeneric.c
@@ -7,16 +7,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)swapgeneric.c       7.2 (Berkeley) %G%
+ *     @(#)swapgeneric.c       7.3 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "conf.h"
-#include "buf.h"
-#include "systm.h"
-#include "reboot.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/reboot.h>
  
  
-#include "../dev/device.h"
+#include <pmax/dev/device.h>
  
  /*
   * Generic configuration;  all in one
  
  /*
   * Generic configuration;  all in one
diff --git a/usr/src/sys/pmax/pmax/sys_machdep.c b/usr/src/sys/pmax/pmax/sys_machdep.c

index 2c0c6a3..d0f5dbd 100644 (file)
--- a/usr/src/sys/pmax/pmax/sys_machdep.c
+++ b/usr/src/sys/pmax/pmax/sys_machdep.c
@@ -7,20 +7,20 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)sys_machdep.c       7.2 (Berkeley) %G%
+ *     @(#)sys_machdep.c       7.3 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/ioctl.h"
-#include "sys/file.h"
-#include "sys/time.h"
-#include "sys/proc.h"
-#include "sys/uio.h"
-#include "sys/kernel.h"
-#include "sys/mtio.h"
-#include "sys/buf.h"
-#include "sys/trace.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/time.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/mtio.h>
+#include <sys/buf.h>
+#include <sys/trace.h>
  
  #ifdef TRACE
  int    nvualarm;
  
  #ifdef TRACE
  int    nvualarm;
diff --git a/usr/src/sys/pmax/pmax/trap.c b/usr/src/sys/pmax/pmax/trap.c

index 6021e32..efddfb9 100644 (file)
--- a/usr/src/sys/pmax/pmax/trap.c
+++ b/usr/src/sys/pmax/pmax/trap.c
@@ -11,33 +11,33 @@
   *
   * from: Utah $Hdr: trap.c 1.32 91/04/06$
   *
   *
   * from: Utah $Hdr: trap.c 1.32 91/04/06$
   *
- *     @(#)trap.c      7.8 (Berkeley) %G%
+ *     @(#)trap.c      7.9 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "kernel.h"
-#include "signalvar.h"
-#include "syscall.h"
-#include "user.h"
-#include "buf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/signalvar.h>
+#include <sys/syscall.h>
+#include <sys/user.h>
+#include <sys/buf.h>
  #ifdef KTRACE
  #ifdef KTRACE
-#include "ktrace.h"
+#include <sys/ktrace.h>
  #endif
  #endif
-#include "net/netisr.h"
-
-#include "../include/trap.h"
-#include "../include/psl.h"
-#include "../include/reg.h"
-#include "../include/cpu.h"
-#include "../include/pte.h"
-#include "../include/mips_opcode.h"
-#include "clockreg.h"
-
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <net/netisr.h>
+
+#include <machine/trap.h>
+#include <machine/psl.h>
+#include <machine/reg.h>
+#include <machine/cpu.h>
+#include <machine/pte.h>
+#include <machine/mips_opcode.h>
+#include <pmax/pmax/clockreg.h>
+
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  /*
   * This is a kludge to allow X windows to work.
  
  /*
   * This is a kludge to allow X windows to work.
diff --git a/usr/src/sys/pmax/pmax/vm_machdep.c b/usr/src/sys/pmax/pmax/vm_machdep.c

index d8d5c91..1d91381 100644 (file)
--- a/usr/src/sys/pmax/pmax/vm_machdep.c
+++ b/usr/src/sys/pmax/pmax/vm_machdep.c
@@ -11,22 +11,22 @@
   *
   * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
   *
   *
   * from: Utah $Hdr: vm_machdep.c 1.21 91/04/06$
   *
- *     @(#)vm_machdep.c        7.5 (Berkeley) %G%
+ *     @(#)vm_machdep.c        7.6 (Berkeley) %G%
   */
  
   */
  
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "malloc.h"
-#include "buf.h"
-#include "vnode.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/user.h>
  
  
-#include "vm/vm.h"
-#include "vm/vm_kern.h"
-#include "vm/vm_page.h"
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_page.h>
  
  
-#include "../include/pte.h"
+#include <machine/pte.h>
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
  
  /*
   * Finish a fork operation, with process p2 nearly set up.
diff --git a/usr/src/sys/stand.att/bmap.c b/usr/src/sys/stand.att/bmap.c

index 61801fd..c245e15 100644 (file)
--- a/usr/src/sys/stand.att/bmap.c
+++ b/usr/src/sys/stand.att/bmap.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)bmap.c      7.2 (Berkeley) %G%
+ *     @(#)bmap.c      7.3 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  #define        NBUFS   4
  static char    b[NBUFS][MAXBSIZE];
  
  #define        NBUFS   4
  static char    b[NBUFS][MAXBSIZE];
diff --git a/usr/src/sys/stand.att/close.c b/usr/src/sys/stand.att/close.c

index f3d1ecf..0ee0df3 100644 (file)
--- a/usr/src/sys/stand.att/close.c
+++ b/usr/src/sys/stand.att/close.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)close.c     7.1 (Berkeley) %G%
+ *     @(#)close.c     7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  close(fdesc)
         int fdesc;
  
  close(fdesc)
         int fdesc;
diff --git a/usr/src/sys/stand.att/dev.c b/usr/src/sys/stand.att/dev.c

index 4e7ce34..4c05b39 100644 (file)
--- a/usr/src/sys/stand.att/dev.c
+++ b/usr/src/sys/stand.att/dev.c
@@ -4,12 +4,12 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)dev.c       7.14 (Berkeley) %G%
+ *     @(#)dev.c       7.15 (Berkeley) %G%
   */
  
  #include <sys/param.h>
  #include <setjmp.h>
   */
  
  #include <sys/param.h>
  #include <setjmp.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  /*
   * NB: the value "io->i_dev", used to offset the devsw[] array in the
  
  /*
   * NB: the value "io->i_dev", used to offset the devsw[] array in the
diff --git a/usr/src/sys/stand.att/getfile.c b/usr/src/sys/stand.att/getfile.c

index df8b39c..282b025 100644 (file)
--- a/usr/src/sys/stand.att/getfile.c
+++ b/usr/src/sys/stand.att/getfile.c
@@ -4,12 +4,12 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)getfile.c   7.6 (Berkeley) %G%
+ *     @(#)getfile.c   7.7 (Berkeley) %G%
   */
  
  #include <sys/param.h>
  #include <sys/time.h>
   */
  
  #include <sys/param.h>
  #include <sys/time.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  getfile(prompt, mode)
         char *prompt;
  
  getfile(prompt, mode)
         char *prompt;
diff --git a/usr/src/sys/stand.att/ioctl.c b/usr/src/sys/stand.att/ioctl.c

index 67283e3..725b917 100644 (file)
--- a/usr/src/sys/stand.att/ioctl.c
+++ b/usr/src/sys/stand.att/ioctl.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)ioctl.c     7.1 (Berkeley) %G%
+ *     @(#)ioctl.c     7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  #ifndef SMALL
  ioctl(fdesc, cmd, arg)
  
  #ifndef SMALL
  ioctl(fdesc, cmd, arg)
diff --git a/usr/src/sys/stand.att/ls.c b/usr/src/sys/stand.att/ls.c

index facda79..58c2117 100644 (file)
--- a/usr/src/sys/stand.att/ls.c
+++ b/usr/src/sys/stand.att/ls.c
@@ -4,13 +4,14 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)ls.c        7.9 (Berkeley) %G%
+ *     @(#)ls.c        7.10 (Berkeley) %G%
   */
  
   */
  
-#include "sys/param.h"
-#include "ufs/dir.h"
-#include "saio.h"
-#include "sys/ttychars.h"
+#include <sys/param.h>
+#include <sys/ttychars.h>
+
+#include <ufs/ufs/dir.h>
+#include <stand/saio.h>
  
  main()
  {
  
  main()
  {
diff --git a/usr/src/sys/stand.att/lseek.c b/usr/src/sys/stand.att/lseek.c

index 0071873..890d677 100644 (file)
--- a/usr/src/sys/stand.att/lseek.c
+++ b/usr/src/sys/stand.att/lseek.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)lseek.c     7.1 (Berkeley) %G%
+ *     @(#)lseek.c     7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  lseek(fdesc, addr, ptr)
         int fdesc, ptr;
  
  lseek(fdesc, addr, ptr)
         int fdesc, ptr;
diff --git a/usr/src/sys/stand.att/open.c b/usr/src/sys/stand.att/open.c

index d9d65c5..0122e7c 100644 (file)
--- a/usr/src/sys/stand.att/open.c
+++ b/usr/src/sys/stand.att/open.c
@@ -4,13 +4,14 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)open.c      7.4 (Berkeley) %G%
+ *     @(#)open.c      7.5 (Berkeley) %G%
   */
  
  #include <sys/param.h>
  #include <sys/reboot.h>
   */
  
  #include <sys/param.h>
  #include <sys/reboot.h>
+
  #include <ufs/ufs/dir.h>
  #include <ufs/ufs/dir.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  int    firstopen;
  u_int  opendev;                        /* last device opened */
  
  int    firstopen;
  u_int  opendev;                        /* last device opened */
diff --git a/usr/src/sys/stand.att/printf.c b/usr/src/sys/stand.att/printf.c

index 54d4c27..e98871a 100644 (file)
--- a/usr/src/sys/stand.att/printf.c
+++ b/usr/src/sys/stand.att/printf.c
@@ -4,7 +4,7 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)printf.c    5.6 (Berkeley) %G%
+ *     @(#)printf.c    5.7 (Berkeley) %G%
   */
  
  /*
   */
  
  /*
diff --git a/usr/src/sys/stand.att/read.c b/usr/src/sys/stand.att/read.c

index 74b1e11..b0937f9 100644 (file)
--- a/usr/src/sys/stand.att/read.c
+++ b/usr/src/sys/stand.att/read.c
@@ -4,11 +4,11 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)read.c      7.1 (Berkeley) %G%
+ *     @(#)read.c      7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  read(fdesc, buf, count)
         int fdesc, count;
  
  read(fdesc, buf, count)
         int fdesc, count;
diff --git a/usr/src/sys/stand.att/saio.h b/usr/src/sys/stand.att/saio.h

index a70d6f4..55e0430 100644 (file)
--- a/usr/src/sys/stand.att/saio.h
+++ b/usr/src/sys/stand.att/saio.h
@@ -4,14 +4,16 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)saio.h      7.18 (Berkeley) %G%
+ *     @(#)saio.h      7.19 (Berkeley) %G%
   */
  
  #include <sys/time.h>
   */
  
  #include <sys/time.h>
+
  #include <ufs/ffs/fs.h>
  #include <ufs/ufs/dinode.h>
  #include <ufs/ffs/fs.h>
  #include <ufs/ufs/dinode.h>
-#include "saioctl.h"
-#include "saerrno.h"
+
+#include <stand/saioctl.h>
+#include <stand/saerrno.h>
  
  #define        UNIX    "/vmunix"
  
  
  #define        UNIX    "/vmunix"
  
diff --git a/usr/src/sys/stand.att/stat.c b/usr/src/sys/stand.att/stat.c

index 136fa14..753f835 100644 (file)
--- a/usr/src/sys/stand.att/stat.c
+++ b/usr/src/sys/stand.att/stat.c
@@ -4,12 +4,12 @@
   *
   * %sccs.include.redist.c%
   *
   *
   * %sccs.include.redist.c%
   *
- *     @(#)stat.c      7.1 (Berkeley) %G%
+ *     @(#)stat.c      7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
  #include <sys/stat.h>
   */
  
  #include <sys/param.h>
  #include <sys/stat.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  #ifndef SMALL
  fstat(fd, sb)
  
  #ifndef SMALL
  fstat(fd, sb)
diff --git a/usr/src/sys/stand.att/sys.c b/usr/src/sys/stand.att/sys.c

index f6dc52e..8612c65 100644 (file)
--- a/usr/src/sys/stand.att/sys.c
+++ b/usr/src/sys/stand.att/sys.c
@@ -4,13 +4,14 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)sys.c       7.17 (Berkeley) %G%
+ *     @(#)sys.c       7.18 (Berkeley) %G%
   */
  
  #include <sys/param.h>
  #include <sys/reboot.h>
   */
  
  #include <sys/param.h>
  #include <sys/reboot.h>
+
  #include <ufs/ufs/dir.h>
  #include <ufs/ufs/dir.h>
-#include "saio.h"
+#include <stand/saio.h>
  
  struct iob iob[SOPEN_MAX];
  int errno;
  
  struct iob iob[SOPEN_MAX];
  int errno;
diff --git a/usr/src/sys/stand.att/write.c b/usr/src/sys/stand.att/write.c

index 3d86bad..3c4a840 100644 (file)
--- a/usr/src/sys/stand.att/write.c
+++ b/usr/src/sys/stand.att/write.c
@@ -4,11 +4,12 @@
   *
   * %sccs.include.proprietary.c%
   *
   *
   * %sccs.include.proprietary.c%
   *
- *     @(#)write.c     7.1 (Berkeley) %G%
+ *     @(#)write.c     7.2 (Berkeley) %G%
   */
  
  #include <sys/param.h>
   */
  
  #include <sys/param.h>
-#include "saio.h"
+
+#include <stand/saio.h>
  
  #ifndef SMALL
  write(fdesc, buf, count)
  
  #ifndef SMALL
  write(fdesc, buf, count)
author	Keith Bostic <bostic@ucbvax.Berkeley.EDU>
	Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)
committer	Keith Bostic <bostic@ucbvax.Berkeley.EDU>
	Mon, 12 Oct 1992 03:23:26 +0000 (19:23 -0800)
usr/src/sys/conf/nfsswapvmunix.c		patch \| blob \| blame \| history
usr/src/sys/conf/param.c		patch \| blob \| blame \| history
usr/src/sys/dev/cd.c		patch \| blob \| blame \| history
usr/src/sys/dev/vn.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/cons.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/dca.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/dcareg.h		patch \| blob \| blame \| history
usr/src/sys/hp/dev/grf.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/hil.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/hil_keymaps.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/hil_subr.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/hilreg.h		patch \| blob \| blame \| history
usr/src/sys/hp/dev/ite.c		patch \| blob \| blame \| history
usr/src/sys/hp/dev/ite_subr.c		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/hpux.h		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/hpux_compat.c		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/hpux_net.c		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/hpux_sig.c		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/hpux_tty.c		patch \| blob \| blame \| history
usr/src/sys/hp/hpux/makesyscalls.sh		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ac.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/cons_conf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ct.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/dcm.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/dcmreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/dma.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/dmareg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/fhpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/fhpibreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_conf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_dv.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_dvreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_gb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_gbreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_hy.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_hyreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_machdep.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_rb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_rbreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_tc.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/grf_tcreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/hpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/if_le.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/if_lereg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ite_dv.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ite_gb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ite_hy.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ite_rb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ite_tc.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/nhpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/nhpibreg.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ppi.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/ppiioctl.h		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/rd.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/scsi.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/sd.c		patch \| blob \| blame \| history
usr/src/sys/hp300/dev/st.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/autoconf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/clock.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/conf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/dkbad.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/genassym.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/in_cksum.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/kgdb_glue.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/kgdb_stub.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/locore.s		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/machdep.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/mem.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/pmap.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/pmap_bootstrap.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/swapgeneric.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/sys_machdep.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/trap.c		patch \| blob \| blame \| history
usr/src/sys/hp300/hp300/vm_machdep.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/Makefile		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/autoconf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/boot.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/conf.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/cons.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ct.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/dca.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/dcm.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/fhpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/hil.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/hpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/installboot.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_dv.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_gb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_hy.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_rb.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_subr.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/ite_tc.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/libsa/Makefile		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/machdep.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/mkboot.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/nhpib.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/rd.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/scsi.c		patch \| blob \| blame \| history
usr/src/sys/hp300/stand/sd.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/autoconf.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/conf.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/cons.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/dkbad.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/genassym.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/in_cksum.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/kgdb_glue.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/kgdb_stub.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/locore.s		patch \| blob \| blame \| history
usr/src/sys/i386/i386/machdep.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/mem.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/pmap.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/swapgeneric.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/sys_machdep.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/trap.c		patch \| blob \| blame \| history
usr/src/sys/i386/i386/vm_machdep.c		patch \| blob \| blame \| history
usr/src/sys/i386/include/cpu.h		patch \| blob \| blame \| history
usr/src/sys/i386/include/pcb.h		patch \| blob \| blame \| history
usr/src/sys/i386/isa/clock.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/com.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/fd.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/fdreg.h		patch \| blob \| blame \| history
usr/src/sys/i386/isa/icu.s		patch \| blob \| blame \| history
usr/src/sys/i386/isa/if_apx.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/if_ec.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/if_ne.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/if_nereg.h		patch \| blob \| blame \| history
usr/src/sys/i386/isa/if_we.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/isa.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/npx.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/pccons.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/wd.c		patch \| blob \| blame \| history
usr/src/sys/i386/isa/wt.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/boot.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/bootxx.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/cga.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/conf.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/fd.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/prf.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/wd.c		patch \| blob \| blame \| history
usr/src/sys/i386/stand/wdbootblk.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_acct.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_clock.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_descrip.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_exec.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_exit.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_ktrace.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_malloc.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_resource.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_sig.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_subr.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_synch.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_sysctl.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_time.c		patch \| blob \| blame \| history
usr/src/sys/kern/kern_xxx.c		patch \| blob \| blame \| history
usr/src/sys/kern/makesyscalls.sh		patch \| blob \| blame \| history
usr/src/sys/kern/subr_autoconf.c		patch \| blob \| blame \| history
usr/src/sys/kern/subr_log.c		patch \| blob \| blame \| history
usr/src/sys/kern/subr_prf.c		patch \| blob \| blame \| history
usr/src/sys/kern/subr_rmap.c		patch \| blob \| blame \| history
usr/src/sys/kern/subr_xxx.c		patch \| blob \| blame \| history
usr/src/sys/kern/sys_generic.c		patch \| blob \| blame \| history
usr/src/sys/kern/sys_process.c		patch \| blob \| blame \| history
usr/src/sys/kern/sys_socket.c		patch \| blob \| blame \| history
usr/src/sys/kern/sysv_shm.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_compat.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_conf.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_pty.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_subr.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_tb.c		patch \| blob \| blame \| history
usr/src/sys/kern/tty_tty.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_domain.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_mbuf.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_proto.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_socket.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_socket2.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_syscalls.c		patch \| blob \| blame \| history
usr/src/sys/kern/uipc_usrreq.c		patch \| blob \| blame \| history
usr/src/sys/kern/vfs_cache.c		patch \| blob \| blame \| history
usr/src/sys/kern/vfs_lookup.c		patch \| blob \| blame \| history
usr/src/sys/kern/vfs_syscalls.c		patch \| blob \| blame \| history
usr/src/sys/kern/vfs_vnops.c		patch \| blob \| blame \| history
usr/src/sys/libkern/locc.c		patch \| blob \| blame \| history
usr/src/sys/libkern/random.c		patch \| blob \| blame \| history
usr/src/sys/libkern/scanc.c		patch \| blob \| blame \| history
usr/src/sys/libkern/skpc.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/dbgprf.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/if_le.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/if_lereg.h		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/sc.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/scsireg.h		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/sd.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/sio.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/dev/st.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/include/stinger.h		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/autoconf.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/clock.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/clockreg.h		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/conf.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/cons.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/genassym.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/locore.s		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/machdep.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/pmap.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/pmap_bootstrap.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/swapgeneric.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/sys_machdep.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/trap.c		patch \| blob \| blame \| history
usr/src/sys/luna68k/luna68k/vm_machdep.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/asc.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/cfb.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/dc.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/if_le.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/pm.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/rz.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/scsi.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/scsi.h		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/sii.c		patch \| blob \| blame \| history
usr/src/sys/pmax/dev/tz.c		patch \| blob \| blame \| history
usr/src/sys/pmax/include/cpu.h		patch \| blob \| blame \| history
usr/src/sys/pmax/include/psl.h		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/OLD/Locore.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/autoconf.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/clock.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/conf.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/cons.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/fp.s		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/genassym.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/kadb.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/locore.s		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/machdep.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/mem.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/pmap.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/swapgeneric.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/sys_machdep.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/trap.c		patch \| blob \| blame \| history
usr/src/sys/pmax/pmax/vm_machdep.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/bmap.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/close.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/dev.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/getfile.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/ioctl.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/ls.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/lseek.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/open.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/printf.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/read.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/saio.h		patch \| blob \| blame \| history
usr/src/sys/stand.att/stat.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/sys.c		patch \| blob \| blame \| history
usr/src/sys/stand.att/write.c		patch \| blob \| blame \| history