aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/autoconf.c20
-rw-r--r--sys/amd64/amd64/db_disasm.c10
-rw-r--r--sys/amd64/amd64/db_interface.c12
-rw-r--r--sys/amd64/amd64/db_trace.c10
-rw-r--r--sys/amd64/amd64/exception.S14
-rw-r--r--sys/amd64/amd64/exception.s14
-rw-r--r--sys/amd64/amd64/fpu.c28
-rw-r--r--sys/amd64/amd64/locore.S20
-rw-r--r--sys/amd64/amd64/locore.s20
-rw-r--r--sys/amd64/amd64/machdep.c34
-rw-r--r--sys/amd64/amd64/pmap.c4
-rw-r--r--sys/amd64/amd64/sys_machdep.c32
-rw-r--r--sys/amd64/amd64/tsc.c22
-rw-r--r--sys/amd64/include/cpu.h6
-rw-r--r--sys/amd64/include/cpufunc.h4
-rw-r--r--sys/amd64/include/pcb.h6
-rw-r--r--sys/amd64/isa/clock.c22
-rw-r--r--sys/amd64/isa/isa.c36
-rw-r--r--sys/amd64/isa/npx.c28
19 files changed, 171 insertions, 171 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 3575d1c7e231..a5ac4b3339ab 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -45,16 +45,16 @@
* devices are determined (from possibilities mentioned in ioconf.c),
* and the drivers are initialized.
*/
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "dkstat.h"
-#include "conf.h"
-#include "dmap.h"
-#include "reboot.h"
-#include "kernel.h"
-
-#include "machine/pte.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/dkstat.h>
+#include <sys/conf.h>
+#include <sys/dmap.h>
+#include <sys/reboot.h>
+#include <sys/kernel.h>
+
+#include <machine/pte.h>
static void swapconf(void);
static void setroot(void);
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index 98e251b684cd..81b6de450131 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -23,16 +23,16 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: db_disasm.c,v 1.4 1993/11/25 01:30:51 wollman Exp $
+ * $Id: db_disasm.c,v 1.5 1993/12/19 00:49:58 wollman Exp $
*/
/*
* Instruction disassembler.
*/
-#include "param.h"
-#include "systm.h"
-#include "proc.h"
-#include "ddb/ddb.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <ddb/ddb.h>
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index e79a2ae4a7ef..595f5acf12de 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -23,17 +23,17 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: db_interface.c,v 1.5 1993/12/19 00:50:00 wollman Exp $
+ * $Id: db_interface.c,v 1.7 1994/05/25 08:53:13 rgrimes Exp $
*/
/*
* Interface to new debugger.
*/
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "proc.h"
-#include "ddb/ddb.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <ddb/ddb.h>
#include <sys/reboot.h>
/* #include <vm/vm_statistics.h> */
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 78aca490d452..ae6b98b06e45 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -23,19 +23,19 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: db_trace.c,v 1.6 1994/05/25 08:53:21 rgrimes Exp $
+ * $Id: db_trace.c,v 1.7 1994/08/06 10:25:33 davidg Exp $
*/
-#include "param.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/lock.h>
#include <vm/vm_prot.h>
#include <vm/pmap.h>
-#include "proc.h"
-#include "ddb/ddb.h"
+#include <sys/proc.h>
+#include <ddb/ddb.h>
#include <ddb/db_access.h>
#include <ddb/db_sym.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 30bc16415aff..7ba980660ffe 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,23 +30,23 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: exception.s,v 1.2 1994/01/03 07:55:20 davidg Exp $
+ * $Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $
*/
#include "npx.h" /* NNPX */
#include "assym.s" /* system defines */
-#include "errno.h" /* error return codes */
+#include <sys/errno.h> /* error return codes */
-#include "machine/spl.h" /* SWI_AST_MASK ... */
+#include <machine/spl.h> /* SWI_AST_MASK ... */
-#include "machine/psl.h" /* PSL_I */
+#include <machine/psl.h> /* PSL_I */
-#include "machine/trap.h" /* trap codes */
-#include "syscall.h" /* syscall numbers */
+#include <machine/trap.h> /* trap codes */
+#include <sys/syscall.h> /* syscall numbers */
-#include "machine/asmacros.h" /* miscellaneous macros */
+#include <machine/asmacros.h> /* miscellaneous macros */
#define KDSEL 0x10 /* kernel data selector */
#define SEL_RPL_MASK 0x0003
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index 30bc16415aff..7ba980660ffe 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,23 +30,23 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: exception.s,v 1.2 1994/01/03 07:55:20 davidg Exp $
+ * $Id: exception.s,v 1.3 1994/04/02 07:00:23 davidg Exp $
*/
#include "npx.h" /* NNPX */
#include "assym.s" /* system defines */
-#include "errno.h" /* error return codes */
+#include <sys/errno.h> /* error return codes */
-#include "machine/spl.h" /* SWI_AST_MASK ... */
+#include <machine/spl.h> /* SWI_AST_MASK ... */
-#include "machine/psl.h" /* PSL_I */
+#include <machine/psl.h> /* PSL_I */
-#include "machine/trap.h" /* trap codes */
-#include "syscall.h" /* syscall numbers */
+#include <machine/trap.h> /* trap codes */
+#include <sys/syscall.h> /* syscall numbers */
-#include "machine/asmacros.h" /* miscellaneous macros */
+#include <machine/asmacros.h> /* miscellaneous macros */
#define KDSEL 0x10 /* kernel data selector */
#define SEL_RPL_MASK 0x0003
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index a3ce1e2bad78..f7f9b27f9c75 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,25 +32,25 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.6 1994/01/03 07:55:43 davidg Exp $
+ * $Id: npx.c,v 1.9 1994/06/11 05:17:15 davidg Exp $
*/
#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 "machine/pcb.h"
-#include "machine/trap.h"
-#include "ioctl.h"
-#include "machine/specialreg.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/isa.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <machine/cpu.h>
+#include <machine/pcb.h>
+#include <machine/trap.h>
+#include <sys/ioctl.h>
+#include <machine/specialreg.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/isa.h>
/*
* 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index c3a62ebcf541..f61c26f4bc90 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.18 1994/06/06 14:12:48 davidg Exp $
+ * $Id: locore.s,v 1.19 1994/08/10 03:51:05 wollman Exp $
*/
/*
@@ -45,15 +45,15 @@
* Bruce Evans, Wolfgang Solfrank, and many others.
*/
-#include "npx.h" /* for NNPX */
-#include "assym.s" /* system definitions */
-#include "machine/psl.h" /* processor status longword defs */
-#include "machine/pte.h" /* page table entry definitions */
-#include "errno.h" /* error return codes */
-#include "machine/specialreg.h" /* x86 special registers */
-#include "machine/cputypes.h" /* x86 cpu type definitions */
-#include "syscall.h" /* system call numbers */
-#include "machine/asmacros.h" /* miscellaneous asm macros */
+#include "npx.h" /* for NNPX */
+#include "assym.s" /* system definitions */
+#include <machine/psl.h> /* processor status longword defs */
+#include <machine/pte.h> /* page table entry definitions */
+#include <sys/errno.h> /* error return codes */
+#include <machine/specialreg.h> /* x86 special registers */
+#include <machine/cputypes.h> /* x86 cpu type definitions */
+#include <sys/syscall.h> /* system call numbers */
+#include <machine/asmacros.h> /* miscellaneous asm macros */
/*
* XXX
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index c3a62ebcf541..f61c26f4bc90 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.18 1994/06/06 14:12:48 davidg Exp $
+ * $Id: locore.s,v 1.19 1994/08/10 03:51:05 wollman Exp $
*/
/*
@@ -45,15 +45,15 @@
* Bruce Evans, Wolfgang Solfrank, and many others.
*/
-#include "npx.h" /* for NNPX */
-#include "assym.s" /* system definitions */
-#include "machine/psl.h" /* processor status longword defs */
-#include "machine/pte.h" /* page table entry definitions */
-#include "errno.h" /* error return codes */
-#include "machine/specialreg.h" /* x86 special registers */
-#include "machine/cputypes.h" /* x86 cpu type definitions */
-#include "syscall.h" /* system call numbers */
-#include "machine/asmacros.h" /* miscellaneous asm macros */
+#include "npx.h" /* for NNPX */
+#include "assym.s" /* system definitions */
+#include <machine/psl.h> /* processor status longword defs */
+#include <machine/pte.h> /* page table entry definitions */
+#include <sys/errno.h> /* error return codes */
+#include <machine/specialreg.h> /* x86 special registers */
+#include <machine/cputypes.h> /* x86 cpu type definitions */
+#include <sys/syscall.h> /* system call numbers */
+#include <machine/asmacros.h> /* miscellaneous asm macros */
/*
* XXX
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 2afe59a3e329..233e0048cc96 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.49 1994/08/10 03:53:33 wollman Exp $
+ * $Id: machdep.c,v 1.50 1994/08/10 23:28:26 wollman Exp $
*/
#include "npx.h"
@@ -61,35 +61,35 @@
#include <sys/sysctl.h>
#ifdef SYSVSHM
-#include "sys/shm.h"
+#include <sys/shm.h>
#endif
#ifdef SYSVMSG
-#include "msg.h"
+#include <sys/msg.h>
#endif
#ifdef SYSVSEM
-#include "sem.h"
+#include <sys/sem.h>
#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 "sys/exec.h"
-#include "sys/vnode.h"
+#include <sys/exec.h>
+#include <sys/vnode.h>
extern vm_offset_t avail_start, avail_end;
-#include "machine/cpu.h"
-#include "machine/reg.h"
-#include "machine/psl.h"
-#include "machine/specialreg.h"
-#include "machine/sysarch.h"
-#include "machine/cons.h"
+#include <machine/cpu.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <machine/specialreg.h>
+#include <machine/sysarch.h>
+#include <machine/cons.h>
-#include "i386/isa/isa.h"
-#include "i386/isa/rtc.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/rtc.h>
static void identifycpu(void);
static void initcpu(void);
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 06003c98f517..2a1011f02e52 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.30 1994/08/07 13:10:19 davidg Exp $
+ * $Id: pmap.c,v 1.31 1994/08/07 14:53:10 davidg Exp $
*/
/*
@@ -159,7 +159,7 @@ extern vm_offset_t clean_sva, clean_eva;
extern int cpu_class;
#if BSDVM_COMPAT
-#include "msgbuf.h"
+#include <sys/msgbuf.h>
/*
* All those kernel PT submaps that BSD is so fond of
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 92758ad8481a..2ddc2b950683 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -34,26 +34,26 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.3 1993/10/16 14:15:10 rgrimes Exp $
+ * $Id: sys_machdep.c,v 1.4 1994/01/31 10:27:01 davidg Exp $
*/
-#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 USER_LDT
-#include "user.h"
-#include "machine/cpu.h"
-#include "machine/sysarch.h"
-#include "vm/vm_kern.h" /* for kernel_map */
+#include <sys/user.h>
+#include <machine/cpu.h>
+#include <machine/sysarch.h>
+#include <vm/vm_kern.h> /* for kernel_map */
#endif
#ifdef TRACE
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index b0ce0a7e9f85..cf0a7f66dfcf 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,22 +34,22 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.10 1994/05/25 08:58:32 rgrimes Exp $
+ * $Id: clock.c,v 1.12 1994/08/11 00:28:24 wollman Exp $
*/
/*
* Primitive clock interrupt routines.
*/
-#include "param.h"
-#include "systm.h"
-#include "time.h"
-#include "kernel.h"
-#include "machine/segments.h"
-#include "machine/frame.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/rtc.h"
-#include "i386/isa/timerreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <machine/segments.h>
+#include <machine/frame.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/rtc.h>
+#include <i386/isa/timerreg.h>
#include <machine/cpu.h>
/* X-tals being what they are, it's nice to be able to fudge this one... */
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 2216d71822c3..8bc20e276add 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
- * $Id: cpu.h,v 1.4 1993/11/07 17:42:46 wollman Exp $
+ * $Id: cpu.h,v 1.6 1994/05/25 08:55:47 rgrimes Exp $
*/
#ifndef _MACHINE_CPU_H_
@@ -43,8 +43,8 @@
/*
* Definitions unique to i386 cpu support.
*/
-#include "machine/frame.h"
-#include "machine/segments.h"
+#include <machine/frame.h>
+#include <machine/segments.h>
#include <machine/spl.h>
/*
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 87245968f505..77f921379418 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cpufunc.h,v 1.14 1994/08/04 19:46:57 davidg Exp $
+ * $Id: cpufunc.h,v 1.15 1994/08/11 02:26:08 jkh Exp $
*/
/*
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include "machine/spl.h"
+#include <machine/spl.h>
#ifdef __GNUC__
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 990e5f90bf7c..953a9ef9b126 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)pcb.h 5.10 (Berkeley) 5/12/91
- * $Id: pcb.h,v 1.3 1993/11/07 17:42:59 wollman Exp $
+ * $Id: pcb.h,v 1.5 1994/05/25 08:56:19 rgrimes Exp $
*/
#ifndef _I386_PCB_H_
@@ -43,8 +43,8 @@
/*
* 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;
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index b0ce0a7e9f85..cf0a7f66dfcf 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,22 +34,22 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.10 1994/05/25 08:58:32 rgrimes Exp $
+ * $Id: clock.c,v 1.12 1994/08/11 00:28:24 wollman Exp $
*/
/*
* Primitive clock interrupt routines.
*/
-#include "param.h"
-#include "systm.h"
-#include "time.h"
-#include "kernel.h"
-#include "machine/segments.h"
-#include "machine/frame.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/rtc.h"
-#include "i386/isa/timerreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <machine/segments.h>
+#include <machine/frame.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/rtc.h>
+#include <i386/isa/timerreg.h>
#include <machine/cpu.h>
/* X-tals being what they are, it's nice to be able to fudge this one... */
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 0daec32bd666..80be9a5f4f6f 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: isa.c,v 1.18 1994/05/25 08:59:24 rgrimes Exp $
+ * $Id: isa.c,v 1.19 1994/08/10 04:39:52 wollman Exp $
*/
/*
@@ -47,24 +47,24 @@
* isa_dmastart()
*/
-#include "param.h"
-#include "systm.h" /* isn't it a joy */
-#include "kernel.h" /* to have three of these */
-#include "conf.h"
-#include "file.h"
-#include "buf.h"
-#include "uio.h"
-#include "syslog.h"
-#include "malloc.h"
-#include "rlist.h"
-#include "machine/segments.h"
-#include "vm/vm.h"
+#include <sys/param.h>
+#include <sys/systm.h> /* isn't it a joy */
+#include <sys/kernel.h> /* to have three of these */
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <sys/syslog.h>
+#include <sys/malloc.h>
+#include <sys/rlist.h>
+#include <machine/segments.h>
+#include <vm/vm.h>
#include <machine/spl.h>
-#include "i386/isa/isa_device.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/ic/i8237.h"
-#include "i386/isa/ic/i8042.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/ic/i8237.h>
+#include <i386/isa/ic/i8042.h>
/*
** Register definitions for DMA controller 1 (channels 0..3):
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index a3ce1e2bad78..f7f9b27f9c75 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,25 +32,25 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.6 1994/01/03 07:55:43 davidg Exp $
+ * $Id: npx.c,v 1.9 1994/06/11 05:17:15 davidg Exp $
*/
#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 "machine/pcb.h"
-#include "machine/trap.h"
-#include "ioctl.h"
-#include "machine/specialreg.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/isa.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <machine/cpu.h>
+#include <machine/pcb.h>
+#include <machine/trap.h>
+#include <sys/ioctl.h>
+#include <machine/specialreg.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/isa.h>
/*
* 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 21:23:12 +0000