diff options
Diffstat (limited to 'sys/arch/i386/include')
45 files changed, 176 insertions, 178 deletions
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h index 2bfdb013b50..e48789e3167 100644 --- a/sys/arch/i386/include/_types.h +++ b/sys/arch/i386/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.10 2009/11/04 19:14:09 kettenis Exp $ */ +/* $OpenBSD: _types.h,v 1.11 2011/03/23 16:54:35 pirofti Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -32,8 +32,8 @@ * @(#)ansi.h 8.2 (Berkeley) 1/4/94 */ -#ifndef _I386__TYPES_H_ -#define _I386__TYPES_H_ +#ifndef _MACHINE__TYPES_H_ +#define _MACHINE__TYPES_H_ #if defined(_KERNEL) typedef struct label_t { @@ -119,4 +119,4 @@ typedef void * __wctype_t; /* Feature test macros */ #define __HAVE_TIMECOUNTER -#endif /* _I386__TYPES_H_ */ +#endif /* _MACHINE__TYPES_H_ */ diff --git a/sys/arch/i386/include/amdmsr.h b/sys/arch/i386/include/amdmsr.h index 00750cfa58c..b1d13fa2279 100644 --- a/sys/arch/i386/include/amdmsr.h +++ b/sys/arch/i386/include/amdmsr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amdmsr.h,v 1.3 2008/06/19 09:58:40 mbalmer Exp $ */ +/* $OpenBSD: amdmsr.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org> @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _SYS_AMDMSR_H_ -#define _SYS_AMDMSR_H_ +#ifndef _MACHINE_AMDMSR_H_ +#define _MACHINE_AMDMSR_H_ struct amdmsr_req { u_int32_t addr; /* 32-bit MSR address */ @@ -31,4 +31,4 @@ struct amdmsr_req { int amdmsr_probe(void); #endif -#endif /* !_SYS_AMDMSR_H_ */ +#endif /* !_MACHINE_AMDMSR_H_ */ diff --git a/sys/arch/i386/include/apicvar.h b/sys/arch/i386/include/apicvar.h index 4762234503e..e282603bd8f 100644 --- a/sys/arch/i386/include/apicvar.h +++ b/sys/arch/i386/include/apicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvar.h,v 1.5 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: apicvar.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: apicvar.h,v 1.1.2.3 2000/02/27 20:25:00 sommerfeld Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_APICVAR_H_ -#define _I386_APICVAR_H_ +#ifndef _MACHINE_APICVAR_H_ +#define _MACHINE_APICVAR_H_ struct apic_attach_args { const char *aaa_name; @@ -48,4 +48,4 @@ struct apic_attach_args { void apic_format_redir(char *, char *, int, u_int32_t, u_int32_t); -#endif /* !_I386_APICVAR_H_ */ +#endif /* !_MACHINE_APICVAR_H_ */ diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h index 7afcf85352d..3844f7ee89d 100644 --- a/sys/arch/i386/include/apmvar.h +++ b/sys/arch/i386/include/apmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apmvar.h,v 1.16 2009/02/26 17:19:47 oga Exp $ */ +/* $OpenBSD: apmvar.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 1995 John T. Kohl @@ -28,8 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. * */ -#ifndef _I386_APMVAR_H_ -#define _I386_APMVAR_H_ +#ifndef _MACHINE_APMVAR_H_ +#define _MACHINE_APMVAR_H_ #include <sys/ioccom.h> @@ -299,4 +299,4 @@ int apm_set_powstate(u_int devid, u_int powstate); int apm_kqfilter(dev_t dev, struct knote *kn); #endif /* _KERNEL */ -#endif /* _I386_APMVAR_H_ */ +#endif /* _MACHINE_APMVAR_H_ */ diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h index 791b415b40e..ce4d1de02ff 100644 --- a/sys/arch/i386/include/asm.h +++ b/sys/arch/i386/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.10 2007/05/27 18:34:01 art Exp $ */ +/* $OpenBSD: asm.h,v 1.11 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)asm.h 5.5 (Berkeley) 5/7/91 */ -#ifndef _I386_ASM_H_ -#define _I386_ASM_H_ +#ifndef _MACHINE_ASM_H_ +#define _MACHINE_ASM_H_ #ifdef PIC #define PIC_PROLOGUE \ @@ -120,4 +120,4 @@ #endif /* _KERNEL */ -#endif /* !_I386_ASM_H_ */ +#endif /* !_MACHINE_ASM_H_ */ diff --git a/sys/arch/i386/include/atomic.h b/sys/arch/i386/include/atomic.h index 217c97b7043..baa720d3e3c 100644 --- a/sys/arch/i386/include/atomic.h +++ b/sys/arch/i386/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.7 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: atomic.h,v 1.1.2.2 2000/02/21 18:54:07 sommerfeld Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_ATOMIC_H_ -#define _I386_ATOMIC_H_ +#ifndef _MACHINE_ATOMIC_H_ +#define _MACHINE_ATOMIC_H_ /* * Perform atomic operations on memory. Should be atomic with respect @@ -105,4 +105,4 @@ i486_atomic_cas_int(volatile u_int *ptr, u_int expect, u_int set) #undef LOCK #endif /* defined(_KERNEL) && !defined(_LOCORE) */ -#endif /* _I386_ATOMIC_H_ */ +#endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h index a044490736d..4e8be582aec 100644 --- a/sys/arch/i386/include/biosvar.h +++ b/sys/arch/i386/include/biosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosvar.h,v 1.54 2011/03/14 22:14:40 krw Exp $ */ +/* $OpenBSD: biosvar.h,v 1.55 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -26,8 +26,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_BIOSVAR_H_ -#define _I386_BIOSVAR_H_ +#ifndef _MACHINE_BIOSVAR_H_ +#define _MACHINE_BIOSVAR_H_ /* some boxes put apm data seg in the 2nd page */ #define BOOTARG_OFF (NBPG*2) @@ -266,4 +266,4 @@ extern bios_pciinfo_t *bios_pciinfo; #endif /* _LOCORE */ #endif /* _KERNEL || _STANDALONE */ -#endif /* _I386_BIOSVAR_H_ */ +#endif /* _MACHINE_BIOSVAR_H_ */ diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h index fc4ec2e0338..e980c2f16dc 100644 --- a/sys/arch/i386/include/bus.h +++ b/sys/arch/i386/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.53 2010/09/06 19:05:48 kettenis Exp $ */ +/* $OpenBSD: bus.h,v 1.54 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -63,8 +63,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_BUS_H_ -#define _I386_BUS_H_ +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ #include <sys/mutex.h> #include <sys/tree.h> @@ -686,4 +686,4 @@ int sg_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, bus_dma_segment_t *, int, int *, int); -#endif /* _I386_BUS_H_ */ +#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 77a060fdf71..f4bc7840041 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.117 2010/10/02 23:13:28 deraadt Exp $ */ +/* $OpenBSD: cpu.h,v 1.118 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)cpu.h 5.4 (Berkeley) 5/9/91 */ -#ifndef _I386_CPU_H_ -#define _I386_CPU_H_ +#ifndef _MACHINE_CPU_H_ +#define _MACHINE_CPU_H_ /* * Definitions unique to i386 cpu support. @@ -492,4 +492,4 @@ void vm86_gpfault(struct proc *, int); #include <sys/mplock.h> #endif -#endif /* !_I386_CPU_H_ */ +#endif /* !_MACHINE_CPU_H_ */ diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h index 0da7c4807a6..fde5f80e289 100644 --- a/sys/arch/i386/include/cpufunc.h +++ b/sys/arch/i386/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.17 2010/08/19 19:31:53 kettenis Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $ */ /* @@ -31,8 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_CPUFUNC_H_ -#define _I386_CPUFUNC_H_ +#ifndef _MACHINE_CPUFUNC_H_ +#define _MACHINE_CPUFUNC_H_ #ifdef _KERNEL @@ -288,4 +288,4 @@ breakpoint(void) void amd64_errata(struct cpu_info *); #endif /* _KERNEL */ -#endif /* !_I386_CPUFUNC_H_ */ +#endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h index d375dc9ea02..65d5b12ed0e 100644 --- a/sys/arch/i386/include/db_machdep.h +++ b/sys/arch/i386/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.20 2010/11/27 19:57:23 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.21 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $ */ /* @@ -27,8 +27,8 @@ * the rights to redistribute these changes. */ -#ifndef _I386_DB_MACHDEP_H_ -#define _I386_DB_MACHDEP_H_ +#ifndef _MACHINE_DB_MACHDEP_H_ +#define _MACHINE_DB_MACHDEP_H_ /* * Machine-dependent defines for new kernel debugger. @@ -112,4 +112,4 @@ extern struct mutex ddb_mp_mutex; #define DDB_STATE_RUNNING 1 #define DDB_STATE_EXITING 2 -#endif /* _I386_DB_MACHDEP_H_ */ +#endif /* _MACHINE_DB_MACHDEP_H_ */ diff --git a/sys/arch/i386/include/exec.h b/sys/arch/i386/include/exec.h index d091741917b..69091707d34 100644 --- a/sys/arch/i386/include/exec.h +++ b/sys/arch/i386/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $ */ +/* $OpenBSD: exec.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_EXEC_H_ -#define _I386_EXEC_H_ +#ifndef _MACHINE_EXEC_H_ +#define _MACHINE_EXEC_H_ #define __LDPGSZ 4096 @@ -48,4 +48,4 @@ #define _KERN_DO_AOUT #define _KERN_DO_ELF -#endif /* _I386_EXEC_H_ */ +#endif /* _MACHINE_EXEC_H_ */ diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h index e2f99895e0c..e31ba958ab8 100644 --- a/sys/arch/i386/include/float.h +++ b/sys/arch/i386/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.7 2008/07/21 20:50:54 martynas Exp $ */ +/* $OpenBSD: float.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */ /* @@ -32,8 +32,8 @@ * @(#)float.h 7.1 (Berkeley) 5/8/90 */ -#ifndef _I386_FLOAT_H_ -#define _I386_FLOAT_H_ +#ifndef _MACHINE_FLOAT_H_ +#define _MACHINE_FLOAT_H_ #include <sys/cdefs.h> @@ -75,4 +75,4 @@ __END_DECLS #define LDBL_MAX 1.18973149535723176502e+4932L #define LDBL_MAX_10_EXP 4932 -#endif /* _I386_FLOAT_H_ */ +#endif /* _MACHINE_FLOAT_H_ */ diff --git a/sys/arch/i386/include/i82093var.h b/sys/arch/i386/include/i82093var.h index 3359f5b8fc8..ef7715b6f42 100644 --- a/sys/arch/i386/include/i82093var.h +++ b/sys/arch/i386/include/i82093var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82093var.h,v 1.9 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: i82093var.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_I82093VAR_H_ -#define _I386_I82093VAR_H_ +#ifndef _MACHINE_I82093VAR_H_ +#define _MACHINE_I82093VAR_H_ #include <machine/apicvar.h> @@ -98,4 +98,4 @@ extern struct ioapic_softc *ioapics; extern u_int16_t ioapic_id_map; extern u_int8_t ioapic_id_remap[]; -#endif /* !_I386_I82093VAR_H_ */ +#endif /* !_MACHINE_I82093VAR_H_ */ diff --git a/sys/arch/i386/include/i82489var.h b/sys/arch/i386/include/i82489var.h index 6a81e1a9b05..b170587afb1 100644 --- a/sys/arch/i386/include/i82489var.h +++ b/sys/arch/i386/include/i82489var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82489var.h,v 1.11 2010/07/25 21:43:37 deraadt Exp $ */ +/* $OpenBSD: i82489var.h,v 1.12 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: i82489var.h,v 1.1.2.2 2000/02/21 18:46:14 sommerfeld Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_I82489VAR_H_ -#define _I386_I82489VAR_H_ +#ifndef _MACHINE_I82489VAR_H_ +#define _MACHINE_I82489VAR_H_ static __inline__ u_int32_t i82489_readreg(int); static __inline__ void i82489_writereg(int, u_int32_t); diff --git a/sys/arch/i386/include/i8259.h b/sys/arch/i386/include/i8259.h index e9c887bf7bf..eea69eb0aa8 100644 --- a/sys/arch/i386/include/i8259.h +++ b/sys/arch/i386/include/i8259.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.h,v 1.4 2006/04/14 22:26:46 weingart Exp $ */ +/* $OpenBSD: i8259.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)icu.h 5.6 (Berkeley) 5/9/91 */ -#ifndef _I386_I8259_H_ -#define _I386_I8259_H_ +#ifndef _MACHINE_I8259_H_ +#define _MACHINE_I8259_H_ #include <dev/isa/isareg.h> @@ -145,4 +145,4 @@ extern void i8259_reinit(void); #endif /* ICU_HARDWARE_MASK */ #endif /* ICU_SPECIAL_MASK_MODE */ -#endif /* !_X86_I8259_H_ */ +#endif /* !_MACHINE_I8259_H_ */ diff --git a/sys/arch/i386/include/ieeefp.h b/sys/arch/i386/include/ieeefp.h index 73e5c2d8ac5..7e5df84f504 100644 --- a/sys/arch/i386/include/ieeefp.h +++ b/sys/arch/i386/include/ieeefp.h @@ -1,12 +1,12 @@ -/* $OpenBSD: ieeefp.h,v 1.2 2000/08/05 22:07:31 niklas Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 * Public domain. */ -#ifndef _I386_IEEEFP_H_ -#define _I386_IEEEFP_H_ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ typedef int fp_except; #define FP_X_INV 0x01 /* invalid operation exception */ @@ -23,4 +23,4 @@ typedef enum { FP_RZ=3 /* round to zero (truncate) */ } fp_rnd; -#endif /* _I386_IEEEFP_H_ */ +#endif /* _MACHINE_IEEEFP_H_ */ diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index f5f4e0d2e8a..015bea84f8c 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.41 2010/12/27 19:51:27 guenther Exp $ */ +/* $OpenBSD: intr.h,v 1.42 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */ /* @@ -30,8 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_INTR_H_ -#define _I386_INTR_H_ +#ifndef _MACHINE_INTR_H_ +#define _MACHINE_INTR_H_ #include <machine/intrdefs.h> @@ -194,4 +194,4 @@ do { \ } while (/*CONSTCOND*/ 0) #endif /* _LOCORE */ -#endif /* !_I386_INTR_H_ */ +#endif /* !_MACHINE_INTR_H_ */ diff --git a/sys/arch/i386/include/ioctl_fd.h b/sys/arch/i386/include/ioctl_fd.h index 4d5b07f2964..296cffbbe6a 100644 --- a/sys/arch/i386/include/ioctl_fd.h +++ b/sys/arch/i386/include/ioctl_fd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ioctl_fd.h,v 1.3 1997/09/16 07:52:31 deraadt Exp $ */ +/* $OpenBSD: ioctl_fd.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */ /* from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp */ /* @@ -30,8 +30,8 @@ * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp */ -#ifndef _I386_IOCTL_FD_H_ -#define _I386_IOCTL_FD_H_ +#ifndef _MACHINE_IOCTL_FD_H_ +#define _MACHINE_IOCTL_FD_H_ #include <sys/ioccom.h> @@ -128,4 +128,4 @@ struct fd_type { #endif /* FDC_500KBPS */ -#endif /* !_I386_IOCTL_FD_H__ */ +#endif /* !_MACHINE_IOCTL_FD_H__ */ diff --git a/sys/arch/i386/include/joystick.h b/sys/arch/i386/include/joystick.h index a2406a2f492..fe37d3576dc 100644 --- a/sys/arch/i386/include/joystick.h +++ b/sys/arch/i386/include/joystick.h @@ -1,8 +1,8 @@ -/* $OpenBSD: joystick.h,v 1.5 2005/01/09 16:39:55 jmc Exp $ */ +/* $OpenBSD: joystick.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: joystick.h,v 1.1 1996/03/27 19:18:56 perry Exp $ */ -#ifndef _JOY_IOCTL_H_ -#define _JOY_IOCTL_H_ +#ifndef _MACHINE_JOYSTICK_H_ +#define _MACHINE_JOYSTICK_H_ #include <sys/ioccom.h> @@ -20,4 +20,4 @@ struct joystick { #define JOY_GET_X_OFFSET _IOR('J', 5, int) /* get offset on X-axis */ #define JOY_GET_Y_OFFSET _IOR('J', 6, int) /* get offset on Y-axis */ -#endif /* _JOY_IOCTL_H_ */ +#endif /* _MACHINE_JOYSTICK_H_ */ diff --git a/sys/arch/i386/include/kvm86.h b/sys/arch/i386/include/kvm86.h index 358208200fb..3641d3b2c10 100644 --- a/sys/arch/i386/include/kvm86.h +++ b/sys/arch/i386/include/kvm86.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm86.h,v 1.1 2006/06/13 03:01:04 gwk Exp $ */ +/* $OpenBSD: kvm86.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 2006 Gordon Willem Klok <gwk@openbsd.org> * @@ -14,8 +14,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _I386_KVM86_H_ -#define _I386_KVM86_H_ +#ifndef _MACHINE_KVM86_H_ +#define _MACHINE_KVM86_H_ struct kvm86regs { uint32_t eax; diff --git a/sys/arch/i386/include/lock.h b/sys/arch/i386/include/lock.h index f0e83ab50b5..fce789cf241 100644 --- a/sys/arch/i386/include/lock.h +++ b/sys/arch/i386/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.6 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: lock.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: lock.h,v 1.1.2.2 2000/05/03 14:40:55 sommerfeld Exp $ */ /*- @@ -34,8 +34,8 @@ * Machine-dependent spin lock operations. */ -#ifndef _I386_LOCK_H_ -#define _I386_LOCK_H_ +#ifndef _MACHINE_LOCK_H_ +#define _MACHINE_LOCK_H_ typedef __volatile int __cpu_simple_lock_t; @@ -115,4 +115,4 @@ extern int rw_cas_486(volatile unsigned long *, unsigned long, unsigned long); #define rw_cas rw_cas_486 #endif -#endif /* _I386_LOCK_H_ */ +#endif /* _MACHINE_LOCK_H_ */ diff --git a/sys/arch/i386/include/mouse.h b/sys/arch/i386/include/mouse.h index 6ed881d6cea..036bd4013dc 100644 --- a/sys/arch/i386/include/mouse.h +++ b/sys/arch/i386/include/mouse.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse.h,v 1.2 1996/10/13 00:55:50 downsj Exp $ */ +/* $OpenBSD: mouse.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: mouse.h,v 1.4 1994/10/27 04:16:10 cgd Exp $ */ /*- @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_MOUSE_H_ -#define _I386_MOUSE_H_ +#ifndef _MACHINE_MOUSE_H_ +#define _MACHINE_MOUSE_H_ struct mouseinfo { unsigned char status; @@ -50,4 +50,4 @@ struct mouseinfo { #define MOUSEIOCSRAW (MOUSEIOC|61) #define MOUSEIOCSCOOKED (MOUSEIOC|62) -#endif /* !_I386_MOUSE_H_ */ +#endif /* !_MACHINE_MOUSE_H_ */ diff --git a/sys/arch/i386/include/mpbiosreg.h b/sys/arch/i386/include/mpbiosreg.h index 63efba7acba..d1af6118619 100644 --- a/sys/arch/i386/include/mpbiosreg.h +++ b/sys/arch/i386/include/mpbiosreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbiosreg.h,v 1.4 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: mpbiosreg.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: mpbiosreg.h,v 1.1.2.3 2000/02/29 13:17:51 sommerfeld Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_MPBIOSREG_H_ -#define _I386_MPBIOSREG_H_ +#ifndef _MACHINE_MPBIOSREG_H_ +#define _MACHINE_MPBIOSREG_H_ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -152,4 +152,4 @@ struct mpbios_int { u_int8_t dst_apic_int; }; -#endif /* !_I386_MPBIOSREG_H_ */ +#endif /* !_MACHINE_MPBIOSREG_H_ */ diff --git a/sys/arch/i386/include/mpbiosvar.h b/sys/arch/i386/include/mpbiosvar.h index 09c9be2f986..86525ffae1c 100644 --- a/sys/arch/i386/include/mpbiosvar.h +++ b/sys/arch/i386/include/mpbiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbiosvar.h,v 1.8 2008/06/26 05:42:10 ray Exp $ */ +/* $OpenBSD: mpbiosvar.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: mpbiosvar.h,v 1.1.2.3 2000/02/29 13:17:20 sommerfeld Exp $ */ /*- @@ -33,8 +33,8 @@ */ -#ifndef _I386_MPBIOSVAR_H_ -#define _I386_MPBIOSVAR_H_ +#ifndef _MACHINE_MPBIOSVAR_H_ +#define _MACHINE_MPBIOSVAR_H_ #define MP_TRAMPOLINE (7 * PAGE_SIZE) @@ -83,4 +83,4 @@ void mpbios_intr_fixup(void); #endif -#endif /* !_I386_MPBIOSVAR_H_ */ +#endif /* !_MACHINE_MPBIOSVAR_H_ */ diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h index 044ab5087ad..de340320e57 100644 --- a/sys/arch/i386/include/mutex.h +++ b/sys/arch/i386/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:25 fgsch Exp $ */ +/* $OpenBSD: mutex.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -24,8 +24,8 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_MUTEX_H_ -#define _I386_MUTEX_H_ +#ifndef _MACHINE_MUTEX_H_ +#define _MACHINE_MUTEX_H_ /* * XXX - we don't really need the mtx_lock field, we can use mtx_oldipl diff --git a/sys/arch/i386/include/npx.h b/sys/arch/i386/include/npx.h index c4171607f67..2949dbb230f 100644 --- a/sys/arch/i386/include/npx.h +++ b/sys/arch/i386/include/npx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: npx.h,v 1.16 2011/03/20 21:44:08 guenther Exp $ */ +/* $OpenBSD: npx.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: npx.h,v 1.11 1994/10/27 04:16:11 cgd Exp $ */ /*- @@ -40,8 +40,8 @@ * W. Jolitz 1/90 */ -#ifndef _I386_NPX_H_ -#define _I386_NPX_H_ +#ifndef _MACHINE_NPX_H_ +#define _MACHINE_NPX_H_ /* Environment information of floating point unit */ struct env87 { @@ -166,4 +166,4 @@ void npxtrap(struct trapframe *); void fpu_kernel_enter(void); void fpu_kernel_exit(void); -#endif /* !_I386_NPX_H_ */ +#endif /* !_MACHINE_NPX_H_ */ diff --git a/sys/arch/i386/include/pcb.h b/sys/arch/i386/include/pcb.h index 66c1b816a63..afea776a2d3 100644 --- a/sys/arch/i386/include/pcb.h +++ b/sys/arch/i386/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.15 2011/03/12 03:52:26 guenther Exp $ */ +/* $OpenBSD: pcb.h,v 1.16 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: pcb.h,v 1.21 1996/01/08 13:51:42 mycroft Exp $ */ /*- @@ -40,8 +40,8 @@ * Intel 386 process control block */ -#ifndef _I386_PCB_H_ -#define _I386_PCB_H_ +#ifndef _MACHINE_PCB_H_ +#define _MACHINE_PCB_H_ #include <sys/signal.h> @@ -93,4 +93,4 @@ struct md_coredump { long md_pad[8]; }; -#endif /* _I386_PCB_H_ */ +#endif /* _MACHINE_PCB_H_ */ diff --git a/sys/arch/i386/include/pctr.h b/sys/arch/i386/include/pctr.h index 8dcc8f228e1..9e8b99fce5b 100644 --- a/sys/arch/i386/include/pctr.h +++ b/sys/arch/i386/include/pctr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.h,v 1.15 2007/10/24 17:56:59 mikeb Exp $ */ +/* $OpenBSD: pctr.h,v 1.16 2011/03/23 16:54:35 pirofti Exp $ */ /* * Pentium performance counter driver for OpenBSD. @@ -9,8 +9,8 @@ * OpenBSD project by leaving this copyright notice intact. */ -#ifndef _I386_PCTR_H_ -#define _I386_PCTR_H_ +#ifndef _MACHINE_PCTR_H_ +#define _MACHINE_PCTR_H_ #include <sys/ioccom.h> @@ -90,4 +90,4 @@ int pctrclose(dev_t, int, int, struct proc *); int pctrioctl(dev_t, u_long, caddr_t, int, struct proc *); #endif /* _KERNEL */ -#endif /* ! _I386_PCTR_H_ */ +#endif /* ! _MACHINE_PCTR_H_ */ diff --git a/sys/arch/i386/include/pio.h b/sys/arch/i386/include/pio.h index 106b2a0c29d..bd56b0f6e07 100644 --- a/sys/arch/i386/include/pio.h +++ b/sys/arch/i386/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.9 2001/06/27 04:34:23 mickey Exp $ */ +/* $OpenBSD: pio.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: pio.h,v 1.13 1996/03/08 20:15:23 cgd Exp $ */ /* @@ -30,8 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_PIO_H_ -#define _I386_PIO_H_ +#ifndef _MACHINE_PIO_H_ +#define _MACHINE_PIO_H_ /* * Functions to provide access to i386 programmed I/O instructions. @@ -198,4 +198,4 @@ outsl(int port, const void *addr, int cnt) : "+S" (addr), "+c" (cnt) : "d" (port) : "cc"); } -#endif /* _I386_PIO_H_ */ +#endif /* _MACHINE_PIO_H_ */ diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h index 12f981ee252..7c269ff5be5 100644 --- a/sys/arch/i386/include/pmap.h +++ b/sys/arch/i386/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.56 2010/12/26 15:40:59 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.57 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */ /* @@ -37,8 +37,8 @@ * pmap.h: see pmap.c for the history of this pmap module. */ -#ifndef _I386_PMAP_H_ -#define _I386_PMAP_H_ +#ifndef _MACHINE_PMAP_H_ +#define _MACHINE_PMAP_H_ #include <machine/cpufunc.h> #include <machine/pte.h> @@ -488,4 +488,4 @@ void pmap_ldt_cleanup(struct proc *); #endif /* USER_LDT */ #endif /* _KERNEL */ -#endif /* _I386_PMAP_H_ */ +#endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h index 27545225f3d..39b93d748d7 100644 --- a/sys/arch/i386/include/psl.h +++ b/sys/arch/i386/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.16 2004/06/28 01:41:53 aaron Exp $ */ +/* $OpenBSD: psl.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)psl.h 5.2 (Berkeley) 1/18/91 */ -#ifndef _I386_PSL_H_ -#define _I386_PSL_H_ +#ifndef _MACHINE_PSL_H_ +#define _MACHINE_PSL_H_ /* * 386 processor status longword. @@ -94,4 +94,4 @@ struct intrhand { #endif /* _LOCORE */ #endif /* _KERNEL */ -#endif /* !_I386_PSL_H_ */ +#endif /* !_MACHINE_PSL_H_ */ diff --git a/sys/arch/i386/include/pte.h b/sys/arch/i386/include/pte.h index 237d14087e4..1dc9df81457 100644 --- a/sys/arch/i386/include/pte.h +++ b/sys/arch/i386/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.12 2010/09/06 14:44:19 jasper Exp $ */ +/* $OpenBSD: pte.h,v 1.13 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: pte.h,v 1.11 1998/02/06 21:58:05 thorpej Exp $ */ /* @@ -41,8 +41,8 @@ * to refer to a hardware manual. */ -#ifndef _I386_PTE_H_ -#define _I386_PTE_H_ +#ifndef _MACHINE_PTE_H_ +#define _MACHINE_PTE_H_ /* * i386 MMU hardware structure: @@ -201,4 +201,4 @@ typedef u_int32_t pt_entry_t; /* PTE */ #define PGEX_U 0x04 /* exception while in user mode (upl) */ #define PGEX_I 0x10 /* instruction fetch blocked by NX */ -#endif /* _I386_PTE_H_ */ +#endif /* _MACHINE_PTE_H_ */ diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h index 8384016d56e..b8c1d54e776 100644 --- a/sys/arch/i386/include/rbus_machdep.h +++ b/sys/arch/i386/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.8 2010/01/13 09:10:33 jsg Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $ */ /* @@ -26,8 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_RBUS_MACHDEP_H_ -#define _I386_RBUS_MACHDEP_H_ +#ifndef _MACHINE_RBUS_MACHDEP_H_ +#define _MACHINE_RBUS_MACHDEP_H_ struct pci_attach_args; /* XXX */ @@ -47,4 +47,4 @@ bus_addr_t rbus_min_start_hint(void); void pccbb_attach_hook(struct device *, struct device *, struct pci_attach_args *); -#endif /* _I386_RBUS_MACHDEP_H_ */ +#endif /* _MACHINE_RBUS_MACHDEP_H_ */ diff --git a/sys/arch/i386/include/reg.h b/sys/arch/i386/include/reg.h index 2b92eb0d520..d5912a23c06 100644 --- a/sys/arch/i386/include/reg.h +++ b/sys/arch/i386/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.6 2005/04/03 20:21:44 kettenis Exp $ */ +/* $OpenBSD: reg.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: reg.h,v 1.14 1995/10/11 04:20:24 mycroft Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)reg.h 5.5 (Berkeley) 1/18/91 */ -#ifndef _I386_REG_H_ -#define _I386_REG_H_ +#ifndef _MACHINE_REG_H_ +#define _MACHINE_REG_H_ /* * Location of the users' stored @@ -100,4 +100,4 @@ struct xmmregs { char __data[512]; }; -#endif /* !_I386_REG_H_ */ +#endif /* !_MACHINE_REG_H_ */ diff --git a/sys/arch/i386/include/reloc.h b/sys/arch/i386/include/reloc.h index 42b34fae737..c183f5475c2 100644 --- a/sys/arch/i386/include/reloc.h +++ b/sys/arch/i386/include/reloc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reloc.h,v 1.2 2010/06/27 03:11:44 guenther Exp $ */ +/* $OpenBSD: reloc.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */ /* * Copyright (c) 2002,2003 Dale Rahn @@ -24,8 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _MACH_RELOC_H -#define _MACH_RELOC_H +#ifndef _MACHINE_RELOC_H_ +#define _MACHINE_RELOC_H_ #define R_TYPE(X) __CONCAT(RELOC_,X) @@ -49,6 +49,4 @@ #define RELOC_TLS_DTPOFF32 36 /* Offset in TLS block */ #define RELOC_TLS_TPOFF32 37 /* Offset in static TLS block */ -#endif /* _MACH_RELOC_H */ - - +#endif /* _MACHINE_RELOC_H_ */ diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h index 1a56a1887e2..f19433322a0 100644 --- a/sys/arch/i386/include/segments.h +++ b/sys/arch/i386/include/segments.h @@ -1,4 +1,4 @@ -/* $OpenBSD: segments.h,v 1.19 2011/03/12 03:52:26 guenther Exp $ */ +/* $OpenBSD: segments.h,v 1.20 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $ */ /*- @@ -42,8 +42,8 @@ * William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989 */ -#ifndef _I386_SEGMENTS_H_ -#define _I386_SEGMENTS_H_ +#ifndef _MACHINE_SEGMENTS_H_ +#define _MACHINE_SEGMENTS_H_ /* * Selectors @@ -231,4 +231,4 @@ void idt_vec_free(int); */ #define NLDT 17 -#endif /* _I386_SEGMENTS_H_ */ +#endif /* _MACHINE_SEGMENTS_H_ */ diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h index ed3fb62bbb8..b006e83c164 100644 --- a/sys/arch/i386/include/signal.h +++ b/sys/arch/i386/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.7 2010/07/03 04:54:32 kettenis Exp $ */ +/* $OpenBSD: signal.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: signal.h,v 1.6 1996/01/08 13:51:43 mycroft Exp $ */ /* @@ -32,8 +32,8 @@ * @(#)signal.h 7.16 (Berkeley) 3/17/91 */ -#ifndef _I386_SIGNAL_H_ -#define _I386_SIGNAL_H_ +#ifndef _MACHINE_SIGNAL_H_ +#define _MACHINE_SIGNAL_H_ #include <sys/cdefs.h> @@ -88,4 +88,4 @@ struct sigcontext { #define sc_ps sc_eflags #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */ -#endif /* !_I386_SIGNAL_H_ */ +#endif /* !_MACHINE_SIGNAL_H_ */ diff --git a/sys/arch/i386/include/stdarg.h b/sys/arch/i386/include/stdarg.h index 9c4ec1b1714..b752bbabce6 100644 --- a/sys/arch/i386/include/stdarg.h +++ b/sys/arch/i386/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.14 2010/12/30 05:01:36 tedu Exp $ */ +/* $OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: stdarg.h,v 1.12 1995/12/25 23:15:31 mycroft Exp $ */ /*- @@ -32,8 +32,8 @@ * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _I386_STDARG_H_ -#define _I386_STDARG_H_ +#ifndef _MACHINE_STDARG_H_ +#define _MACHINE_STDARG_H_ #include <sys/cdefs.h> #include <machine/_types.h> @@ -56,4 +56,4 @@ typedef __va_list va_list; #define va_end(ap) -#endif /* !_I386_STDARG_H_ */ +#endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/arch/i386/include/svr4_machdep.h b/sys/arch/i386/include/svr4_machdep.h index 17926ef3cfc..dfd506fd5cc 100644 --- a/sys/arch/i386/include/svr4_machdep.h +++ b/sys/arch/i386/include/svr4_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: svr4_machdep.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: svr4_machdep.h,v 1.5 1995/03/31 02:51:37 christos Exp $ */ /* @@ -28,8 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _I386_SVR4_MACHDEP_H_ -#define _I386_SVR4_MACHDEP_H_ +#ifndef _MACHINE_SVR4_MACHDEP_H_ +#define _MACHINE_SVR4_MACHDEP_H_ #include <compat/svr4/svr4_types.h> @@ -116,4 +116,4 @@ struct svr4_ssd { #define SVR4_T_PAGEFLT 14 #define SVR4_T_ALIGNFLT 17 -#endif /* !_I386_SVR4_MACHDEP_H_ */ +#endif /* !_MACHINE_SVR4_MACHDEP_H_ */ diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h index 1115026c63d..88be9d6036e 100644 --- a/sys/arch/i386/include/sysarch.h +++ b/sys/arch/i386/include/sysarch.h @@ -1,8 +1,8 @@ -/* $OpenBSD: sysarch.h,v 1.6 2011/03/12 03:52:26 guenther Exp $ */ +/* $OpenBSD: sysarch.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $ */ -#ifndef _I386_SYSARCH_H_ -#define _I386_SYSARCH_H_ +#ifndef _MACHINE_SYSARCH_H_ +#define _MACHINE_SYSARCH_H_ /* * Architecture specific syscalls (i386) @@ -55,4 +55,4 @@ int i386_set_gsbase(void *); int sysarch(int, void *); #endif -#endif /* !_I386_SYSARCH_H_ */ +#endif /* !_MACHINE_SYSARCH_H_ */ diff --git a/sys/arch/i386/include/tss.h b/sys/arch/i386/include/tss.h index 7590b8ce3a1..705d62b6b18 100644 --- a/sys/arch/i386/include/tss.h +++ b/sys/arch/i386/include/tss.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tss.h,v 1.7 2006/04/27 15:37:53 mickey Exp $ */ +/* $OpenBSD: tss.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: tss.h,v 1.6 1995/10/11 04:20:28 mycroft Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)tss.h 5.4 (Berkeley) 1/18/91 */ -#ifndef _I386_TSS_H_ -#define _I386_TSS_H_ +#ifndef _MACHINE_TSS_H_ +#define _MACHINE_TSS_H_ /* * Intel 386 Context Data Type @@ -71,4 +71,4 @@ struct i386tss { int tss_ioopt; /* options and I/O permission map offset */ }; -#endif /* _I386_TSS_H_ */ +#endif /* _MACHINE_TSS_H_ */ diff --git a/sys/arch/i386/include/varargs.h b/sys/arch/i386/include/varargs.h index 58f14545a9c..9710eb95d48 100644 --- a/sys/arch/i386/include/varargs.h +++ b/sys/arch/i386/include/varargs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:47 millert Exp $ */ +/* $OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: varargs.h,v 1.14 1995/12/26 01:16:26 mycroft Exp $ */ /*- @@ -37,8 +37,8 @@ * @(#)varargs.h 8.2 (Berkeley) 3/22/94 */ -#ifndef _I386_VARARGS_H_ -#define _I386_VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #include <machine/stdarg.h> @@ -55,4 +55,4 @@ #define va_start(ap) \ ((ap) = (va_list)&__builtin_va_alist) -#endif /* !_I386_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ diff --git a/sys/arch/i386/include/vga_post.h b/sys/arch/i386/include/vga_post.h index 36a9a2d4680..913fa68eff0 100644 --- a/sys/arch/i386/include/vga_post.h +++ b/sys/arch/i386/include/vga_post.h @@ -1,5 +1,5 @@ /* $NetBSD: vga_post.h,v 1.2 2008/03/29 17:40:22 jmcneill Exp $ */ -/* $OpenBSD: vga_post.h,v 1.1 2009/06/06 00:35:00 pirofti Exp $ */ +/* $OpenBSD: vga_post.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _X86_VGA_POST_H_ -#define _X86_VGA_POST_H_ +#ifndef _MACHINE_VGA_POST_H_ +#define _MACHINE_VGA_POST_H_ #ifdef _KERNEL struct vga_post; diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h index 11cd911f1bf..a515322edc0 100644 --- a/sys/arch/i386/include/vmparam.h +++ b/sys/arch/i386/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.46 2011/01/07 03:15:39 tedu Exp $ */ +/* $OpenBSD: vmparam.h,v 1.47 2011/03/23 16:54:35 pirofti Exp $ */ /* $NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)vmparam.h 5.9 (Berkeley) 5/12/91 */ -#ifndef _MACHINE_VM_PARAM_H_ -#define _MACHINE_VM_PARAM_H_ +#ifndef _MACHINE_VMPARAM_H_ +#define _MACHINE_VMPARAM_H_ /* * Machine dependent constants for 386. */ @@ -131,4 +131,4 @@ struct vm_page_md { (pg)->mdpage.pv_list = NULL; \ } while (0) -#endif /* _MACHINE_VM_PARAM_H_ */ +#endif /* _MACHINE_VMPARAM_H_ */ |