diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2011-03-23 16:54:38 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2011-03-23 16:54:38 +0000 |
| commit | 96b354137b8039e6c2ebd6f88c0008ecb2e4f20d (patch) | |
| tree | b34cf5e18c5986eb1ce733aad820bd3ce42c6b46 /sys/arch/amd64/include | |
| parent | d81ed92368684fcbb0e5ea3bcf868e6252a6ddda (diff) | |
Normalize sentinel. Use _MACHINE_*_H_ and _<ARCH>_*_H_ properly and consitently.
Discussed and okay drahn@. Okay deraadt@.
Diffstat (limited to 'sys/arch/amd64/include')
43 files changed, 168 insertions, 168 deletions
diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h index 9d4eed417e9..9258a4133fc 100644 --- a/sys/arch/amd64/include/_types.h +++ b/sys/arch/amd64/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.6 2009/11/04 19:14:09 kettenis Exp $ */ +/* $OpenBSD: _types.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -32,8 +32,8 @@ * @(#)ansi.h 8.2 (Berkeley) 1/4/94 */ -#ifndef _AMD64__TYPES_H_ -#define _AMD64__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 /* _AMD64__TYPES_H_ */ +#endif /* _MACHINE__TYPES_H_ */ diff --git a/sys/arch/amd64/include/apicvar.h b/sys/arch/amd64/include/apicvar.h index 16f65a595c8..0478ed5f421 100644 --- a/sys/arch/amd64/include/apicvar.h +++ b/sys/arch/amd64/include/apicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvar.h,v 1.2 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: apicvar.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: apicvar.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _X86_APICVAR_H_ -#define _X86_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 /* !_X86_APICVAR_H_ */ +#endif /* !_MACHINE_APICVAR_H_ */ diff --git a/sys/arch/amd64/include/apmvar.h b/sys/arch/amd64/include/apmvar.h index b8a27a2ab83..1a3925ec0b9 100644 --- a/sys/arch/amd64/include/apmvar.h +++ b/sys/arch/amd64/include/apmvar.h @@ -1,5 +1,5 @@ /* XXX - DSR */ -/* $OpenBSD: apmvar.h,v 1.2 2009/02/26 17:19:47 oga Exp $ */ +/* $OpenBSD: apmvar.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* * Copyright (c) 1995 John T. Kohl @@ -29,8 +29,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/amd64/include/asm.h b/sys/arch/amd64/include/asm.h index 59c5b66c7db..d9b41e9ac10 100644 --- a/sys/arch/amd64/include/asm.h +++ b/sys/arch/amd64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.2 2005/12/13 00:18:19 jsg Exp $ */ +/* $OpenBSD: asm.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: asm.h,v 1.2 2003/05/02 18:05:47 yamt Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)asm.h 5.5 (Berkeley) 5/7/91 */ -#ifndef _AMD64_ASM_H_ -#define _AMD64_ASM_H_ +#ifndef _MACHINE_ASM_H_ +#define _MACHINE_ASM_H_ #ifdef PIC #define PIC_PLT(x) x@PLT @@ -115,4 +115,4 @@ .stabs __STRING(sym),1,0,0,0 #endif /* __STDC__ */ -#endif /* !_AMD64_ASM_H_ */ +#endif /* !_MACHINE_ASM_H_ */ diff --git a/sys/arch/amd64/include/atomic.h b/sys/arch/amd64/include/atomic.h index 4578f9a0478..effbb04c4db 100644 --- a/sys/arch/amd64/include/atomic.h +++ b/sys/arch/amd64/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.7 2010/12/27 20:22:23 guenther Exp $ */ +/* $OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: atomic.h,v 1.1 2003/04/26 18:39:37 fvdl Exp $ */ /* @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_ATOMIC_H -#define _AMD64_ATOMIC_H +#ifndef _MACHINE_ATOMIC_H_ +#define _MACHINE_ATOMIC_H_ /* * Perform atomic operations on memory. Should be atomic with respect @@ -131,4 +131,4 @@ x86_atomic_clearbits_u64(volatile u_int64_t *ptr, u_int64_t bits) #undef LOCK #endif /* defined(_KERNEL) && !defined(_LOCORE) */ -#endif /* _AMD64_ATOMIC_H_ */ +#endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h index 0abc8c2b4f8..583e5544148 100644 --- a/sys/arch/amd64/include/biosvar.h +++ b/sys/arch/amd64/include/biosvar.h @@ -1,5 +1,5 @@ /* XXX - DSR */ -/* $OpenBSD: biosvar.h,v 1.12 2011/03/14 22:14:40 krw Exp $ */ +/* $OpenBSD: biosvar.h,v 1.13 2011/03/23 16:54:34 pirofti Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -29,8 +29,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) @@ -263,4 +263,4 @@ extern bios_memmap_t *bios_memmap; #endif /* _LOCORE */ #endif /* _KERNEL || _STANDALONE */ -#endif /* _I386_BIOSVAR_H_ */ +#endif /* _MACHINE_BIOSVAR_H_ */ diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h index cdb107a2022..5c8fab5b0bc 100644 --- a/sys/arch/amd64/include/bus.h +++ b/sys/arch/amd64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.24 2010/09/06 19:05:48 kettenis Exp $ */ +/* $OpenBSD: bus.h,v 1.25 2011/03/23 16:54:34 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 _X86_BUS_H_ -#define _X86_BUS_H_ +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ #include <sys/mutex.h> #include <sys/tree.h> @@ -682,4 +682,4 @@ int sg_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, paddr_t bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); -#endif /* _X86_BUS_H_ */ +#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index 7666e74dfa8..260212f10a9 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.62 2010/11/29 00:04:09 dlg Exp $ */ +/* $OpenBSD: cpu.h,v 1.63 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)cpu.h 5.4 (Berkeley) 5/9/91 */ -#ifndef _AMD64_CPU_H_ -#define _AMD64_CPU_H_ +#ifndef _MACHINE_CPU_H_ +#define _MACHINE_CPU_H_ /* * Definitions unique to x86-64 cpu support. @@ -370,4 +370,4 @@ void mp_setperf_init(void); */ #define CR4_DEFAULT (CR4_PAE|CR4_PGE|CR4_PSE|CR4_OSFXSR|CR4_OSXMMEXCPT) -#endif /* !_AMD64_CPU_H_ */ +#endif /* !_MACHINE_CPU_H_ */ diff --git a/sys/arch/amd64/include/cpufunc.h b/sys/arch/amd64/include/cpufunc.h index dcc80a93ee5..1373e1712df 100644 --- a/sys/arch/amd64/include/cpufunc.h +++ b/sys/arch/amd64/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.6 2010/12/07 22:12:44 deraadt Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: cpufunc.h,v 1.3 2003/05/08 10:27:43 fvdl Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_CPUFUNC_H_ -#define _AMD64_CPUFUNC_H_ +#ifndef _MACHINE_CPUFUNC_H_ +#define _MACHINE_CPUFUNC_H_ /* * Functions to provide access to i386-specific instructions. @@ -309,4 +309,4 @@ void amd64_errata(struct cpu_info *); #endif /* _KERNEL */ -#endif /* !_AMD64_CPUFUNC_H_ */ +#endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/arch/amd64/include/db_machdep.h b/sys/arch/amd64/include/db_machdep.h index 94f4433dbad..343d50acd6c 100644 --- a/sys/arch/amd64/include/db_machdep.h +++ b/sys/arch/amd64/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.9 2010/11/27 19:57:23 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: db_machdep.h,v 1.2 2003/04/29 17:06:04 scw 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. @@ -122,4 +122,4 @@ extern void db_machine_init(void); extern void cpu_debug_dump(void); -#endif /* _I386_DB_MACHDEP_H_ */ +#endif /* _MACHINE_DB_MACHDEP_H_ */ diff --git a/sys/arch/amd64/include/exec.h b/sys/arch/amd64/include/exec.h index 4acd4243c80..c57d61e4340 100644 --- a/sys/arch/amd64/include/exec.h +++ b/sys/arch/amd64/include/exec.h @@ -1,10 +1,10 @@ -/* $OpenBSD: exec.h,v 1.2 2004/02/27 17:41:25 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* * Written by Artur Grabowski <art@openbsd.org> Public Domain */ -#ifndef _AMD64_EXEC_H_ -#define _AMD64_EXEC_H_ +#ifndef _MACHINE_EXEC_H_ +#define _MACHINE_EXEC_H_ #define __LDPGSZ 4096 diff --git a/sys/arch/amd64/include/float.h b/sys/arch/amd64/include/float.h index 6050cd4fa76..6aab8daf03a 100644 --- a/sys/arch/amd64/include/float.h +++ b/sys/arch/amd64/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $ */ +/* $OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 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/amd64/include/fpu.h b/sys/arch/amd64/include/fpu.h index 345bebbb8ce..bda8f0521d0 100644 --- a/sys/arch/amd64/include/fpu.h +++ b/sys/arch/amd64/include/fpu.h @@ -1,8 +1,8 @@ -/* $OpenBSD: fpu.h,v 1.8 2011/03/20 21:44:08 guenther Exp $ */ +/* $OpenBSD: fpu.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: fpu.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */ -#ifndef _AMD64_FPU_H_ -#define _AMD64_FPU_H_ +#ifndef _MACHINE_FPU_H_ +#define _MACHINE_FPU_H_ #include <sys/types.h> @@ -62,4 +62,4 @@ void fpu_kernel_exit(void); #endif -#endif /* _AMD64_FPU_H_ */ +#endif /* _MACHINE_FPU_H_ */ diff --git a/sys/arch/amd64/include/frame.h b/sys/arch/amd64/include/frame.h index 5aee1643160..dcf53bba447 100644 --- a/sys/arch/amd64/include/frame.h +++ b/sys/arch/amd64/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.4 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: frame.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: frame.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */ /*- @@ -68,8 +68,8 @@ * Adapted for NetBSD/amd64 by fvdl@wasabisystems.com */ -#ifndef _AMD64_FRAME_H_ -#define _AMD64_FRAME_H_ +#ifndef _MACHINE_FRAME_H_ +#define _MACHINE_FRAME_H_ #include <sys/signal.h> #include <machine/fpu.h> @@ -160,4 +160,4 @@ struct switchframe { int64_t sf_rip; }; -#endif /* _AMD64_FRAME_H_ */ +#endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/arch/amd64/include/i82093var.h b/sys/arch/amd64/include/i82093var.h index f1817ac0c51..45b3eeb24e2 100644 --- a/sys/arch/amd64/include/i82093var.h +++ b/sys/arch/amd64/include/i82093var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82093var.h,v 1.2 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: i82093var.h,v 1.3 2011/03/23 16:54:34 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 _X86_I82093VAR_H_ -#define _X86_I82093VAR_H_ +#ifndef _MACHINE_I82093VAR_H_ +#define _MACHINE_I82093VAR_H_ #include <machine/apicvar.h> @@ -94,4 +94,4 @@ extern int ioapic_bsp_id; extern int nioapics; extern struct ioapic_softc *ioapics; -#endif /* !_X86_I82093VAR_H_ */ +#endif /* !_MACHINE_I82093VAR_H_ */ diff --git a/sys/arch/amd64/include/i82489var.h b/sys/arch/amd64/include/i82489var.h index 565675b0192..1181e137d0e 100644 --- a/sys/arch/amd64/include/i82489var.h +++ b/sys/arch/amd64/include/i82489var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82489var.h,v 1.11 2010/07/25 21:43:38 deraadt Exp $ */ +/* $OpenBSD: i82489var.h,v 1.12 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: i82489var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _X86_I82489REG_H_ -#define _X86_I82489REG_H_ +#ifndef _MACHINE_I82489VAR_H_ +#define _MACHINE_I82489VAR_H_ /* * Software definitions belonging to Local APIC driver. diff --git a/sys/arch/amd64/include/i8259.h b/sys/arch/amd64/include/i8259.h index 5e3d2672a4e..0a686b99baf 100644 --- a/sys/arch/amd64/include/i8259.h +++ b/sys/arch/amd64/include/i8259.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.h,v 1.2 2005/12/13 00:18:19 jsg Exp $ */ +/* $OpenBSD: i8259.h,v 1.3 2011/03/23 16:54:34 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 _X86_I8259_H_ -#define _X86_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/amd64/include/ieeefp.h b/sys/arch/amd64/include/ieeefp.h index 774ee8d6adc..fce3d83447a 100644 --- a/sys/arch/amd64/include/ieeefp.h +++ b/sys/arch/amd64/include/ieeefp.h @@ -1,12 +1,12 @@ -/* $OpenBSD: ieeefp.h,v 1.1 2004/01/28 01:39:39 mickey Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:34 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/amd64/include/intr.h b/sys/arch/amd64/include/intr.h index c820a2456e7..5a6212ffcdf 100644 --- a/sys/arch/amd64/include/intr.h +++ b/sys/arch/amd64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.21 2010/12/27 19:51:27 guenther Exp $ */ +/* $OpenBSD: intr.h,v 1.22 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _X86_INTR_H_ -#define _X86_INTR_H_ +#ifndef _MACHINE_INTR_H_ +#define _MACHINE_INTR_H_ #include <machine/intrdefs.h> @@ -270,4 +270,4 @@ do { \ } while (/*CONSTCOND*/ 0) #endif /* _LOCORE */ -#endif /* !_X86_INTR_H_ */ +#endif /* !_MACHINE_INTR_H_ */ diff --git a/sys/arch/amd64/include/ioctl_fd.h b/sys/arch/amd64/include/ioctl_fd.h index 51f95755e5d..b0c4c6f9ce0 100644 --- a/sys/arch/amd64/include/ioctl_fd.h +++ b/sys/arch/amd64/include/ioctl_fd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ioctl_fd.h,v 1.1 2005/09/19 01:28:04 deraadt Exp $ */ +/* $OpenBSD: ioctl_fd.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */ /* * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden @@ -29,8 +29,8 @@ * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp */ -#ifndef _AMD64_IOCTL_FD_H_ -#define _AMD64_IOCTL_FD_H_ +#ifndef _MACHINE_IOCTL_FD_H_ +#define _MACHINE_IOCTL_FD_H_ #include <sys/ioccom.h> @@ -127,4 +127,4 @@ struct fd_type { #endif /* FDC_500KBPS */ -#endif /* !_AMD64_IOCTL_FD_H__ */ +#endif /* !_MACHINE_IOCTL_FD_H__ */ diff --git a/sys/arch/amd64/include/kcore.h b/sys/arch/amd64/include/kcore.h index 47b3e329641..ebf214799b7 100644 --- a/sys/arch/amd64/include/kcore.h +++ b/sys/arch/amd64/include/kcore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kcore.h,v 1.3 2007/11/16 17:09:17 mikeb Exp $ */ +/* $OpenBSD: kcore.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: kcore.h,v 1.1 2003/04/26 18:39:43 fvdl Exp $ */ /* @@ -36,8 +36,8 @@ * Wasabi Systems, Inc. */ -#ifndef _AMD64_KCORE_H_ -#define _AMD64_KCORE_H_ +#ifndef _MACHINE_KCORE_H_ +#define _MACHINE_KCORE_H_ typedef struct cpu_kcore_hdr { u_int64_t ptdpaddr; /* PA of PML4 */ @@ -47,4 +47,4 @@ typedef struct cpu_kcore_hdr { #endif } cpu_kcore_hdr_t; -#endif /* _AMD64_KCORE_H_ */ +#endif /* _MACHINE_KCORE_H_ */ diff --git a/sys/arch/amd64/include/lock.h b/sys/arch/amd64/include/lock.h index 2dfd082f08c..4cff0e75ebe 100644 --- a/sys/arch/amd64/include/lock.h +++ b/sys/arch/amd64/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.5 2008/12/04 15:48:19 weingart Exp $ */ +/* $OpenBSD: lock.h,v 1.6 2011/03/23 16:54:34 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 _AMD64_LOCK_H_ -#define _AMD64_LOCK_H_ +#ifndef _MACHINE_LOCK_H_ +#define _MACHINE_LOCK_H_ typedef __volatile int __cpu_simple_lock_t; @@ -112,4 +112,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *lockp) #define rw_cas(p, o, n) (x86_atomic_cas_ul(p, o, n) != o) -#endif /* _AMD64_LOCK_H_ */ +#endif /* _MACHINE_LOCK_H_ */ diff --git a/sys/arch/amd64/include/mcontext.h b/sys/arch/amd64/include/mcontext.h index 7f71b77ca87..6d2c7d57c0b 100644 --- a/sys/arch/amd64/include/mcontext.h +++ b/sys/arch/amd64/include/mcontext.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mcontext.h,v 1.2 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: mcontext.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: mcontext.h,v 1.1 2003/04/26 18:39:44 fvdl Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_MCONTEXT_H_ -#define _AMD64_MCONTEXT_H_ +#ifndef _MACHINE_MCONTEXT_H_ +#define _MACHINE_MCONTEXT_H_ /* * Layout of mcontext_t according to the System V Application Binary Interface, @@ -98,4 +98,4 @@ typedef struct { #define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_URSP]) #endif -#endif /* !_AMD64_MCONTEXT_H_ */ +#endif /* !_MACHINE_MCONTEXT_H_ */ diff --git a/sys/arch/amd64/include/mpbiosreg.h b/sys/arch/amd64/include/mpbiosreg.h index ea37a7e21d6..9e284b053ad 100644 --- a/sys/arch/amd64/include/mpbiosreg.h +++ b/sys/arch/amd64/include/mpbiosreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbiosreg.h,v 1.3 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: mpbiosreg.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: mpbiosreg.h,v 1.3 2003/03/04 23:27:32 fvdl Exp $ */ /*- @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _X86_MPBIOSREG_H_ -#define _X86_MPBIOSREG_H_ +#ifndef _MACHINE_MPBIOSREG_H_ +#define _MACHINE_MPBIOSREG_H_ #define BIOS_BASE (0xf0000) #define BIOS_SIZE (0x10000) @@ -153,4 +153,4 @@ struct mpbios_int { }; -#endif /* !_X86_MPBIOSREG_H_ */ +#endif /* !_MACHINE_MPBIOSREG_H_ */ diff --git a/sys/arch/amd64/include/mpbiosvar.h b/sys/arch/amd64/include/mpbiosvar.h index ff715a29f65..8dce24cbb5e 100644 --- a/sys/arch/amd64/include/mpbiosvar.h +++ b/sys/arch/amd64/include/mpbiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbiosvar.h,v 1.3 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: mpbiosvar.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: mpbiosvar.h,v 1.2 2003/04/02 07:53:57 thorpej Exp $ */ /*- @@ -33,8 +33,8 @@ */ -#ifndef _X86_MPBIOSVAR_H_ -#define _X86_MPBIOSVAR_H_ +#ifndef _MACHINE_MPBIOSVAR_H_ +#define _MACHINE_MPBIOSVAR_H_ #define MP_TRAMPOLINE (2 * PAGE_SIZE) @@ -54,4 +54,4 @@ extern int mpbios_scanned; #endif -#endif /* !_X86_MPBIOSVAR_H_ */ +#endif /* !_MACHINE_MPBIOSVAR_H_ */ diff --git a/sys/arch/amd64/include/mutex.h b/sys/arch/amd64/include/mutex.h index 1c712e87bce..6ce401c8f34 100644 --- a/sys/arch/amd64/include/mutex.h +++ b/sys/arch/amd64/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:24 fgsch Exp $ */ +/* $OpenBSD: mutex.h,v 1.4 2011/03/23 16:54:34 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 _AMD64_MUTEX_H_ -#define _AMD64_MUTEX_H_ +#ifndef _MACHINE_MUTEX_H_ +#define _MACHINE_MUTEX_H_ struct mutex { int mtx_wantipl; diff --git a/sys/arch/amd64/include/pcb.h b/sys/arch/amd64/include/pcb.h index 8151dc666d4..3a7ced70e88 100644 --- a/sys/arch/amd64/include/pcb.h +++ b/sys/arch/amd64/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.7 2010/11/13 04:16:42 guenther Exp $ */ +/* $OpenBSD: pcb.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pcb.h,v 1.1 2003/04/26 18:39:45 fvdl Exp $ */ /*- @@ -68,8 +68,8 @@ * XXXfvdl these copyrights don't really match anymore */ -#ifndef _AMD64_PCB_H_ -#define _AMD64_PCB_H_ +#ifndef _MACHINE_PCB_H_ +#define _MACHINE_PCB_H_ #include <sys/signal.h> @@ -100,4 +100,4 @@ struct md_coredump { long md_pad[8]; }; -#endif /* _AMD64_PCB_H_ */ +#endif /* _MACHINE_PCB_H_ */ diff --git a/sys/arch/amd64/include/pctr.h b/sys/arch/amd64/include/pctr.h index 427bcb52ee0..bcaef0814ec 100644 --- a/sys/arch/amd64/include/pctr.h +++ b/sys/arch/amd64/include/pctr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.h,v 1.3 2007/10/24 17:56:57 mikeb Exp $ */ +/* $OpenBSD: pctr.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* * Pentium performance counter driver for OpenBSD. @@ -9,8 +9,8 @@ * OpenBSD project by leaving this copyright notice intact. */ -#ifndef _AMD64_PCTR_H_ -#define _AMD64_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 /* ! _AMD64_PCTR_H_ */ +#endif /* ! _MACHINE_PCTR_H_ */ diff --git a/sys/arch/amd64/include/pio.h b/sys/arch/amd64/include/pio.h index e35d8da275e..ddf48d4c6f1 100644 --- a/sys/arch/amd64/include/pio.h +++ b/sys/arch/amd64/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.2 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: pio.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pio.h,v 1.2 2003/02/27 11:22:46 fvdl Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _X86_PIO_H_ -#define _X86_PIO_H_ +#ifndef _MACHINE_PIO_H_ +#define _MACHINE_PIO_H_ /* * Functions to provide access to x86 programmed I/O instructions. @@ -222,4 +222,4 @@ outsl(unsigned port, const void *addr, int cnt) "d" (port), "0" (addr), "1" (cnt)); } -#endif /* _X86_PIO_H_ */ +#endif /* _MACHINE_PIO_H_ */ diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h index 17be6cc7b0e..b559ff03244 100644 --- a/sys/arch/amd64/include/pmap.h +++ b/sys/arch/amd64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.37 2010/12/26 15:40:59 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.38 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -72,8 +72,8 @@ * pmap.h: see pmap.c for the history of this pmap module. */ -#ifndef _AMD64_PMAP_H_ -#define _AMD64_PMAP_H_ +#ifndef _MACHINE_PMAP_H_ +#define _MACHINE_PMAP_H_ #ifndef _LOCORE #include <machine/cpufunc.h> @@ -570,4 +570,4 @@ kvtopte(vaddr_t va) #define __HAVE_PMAP_DIRECT #endif /* _KERNEL && !_LOCORE */ -#endif /* _AMD64_PMAP_H_ */ +#endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/amd64/include/proc.h b/sys/arch/amd64/include/proc.h index 07679dfa575..b56cdb7e50f 100644 --- a/sys/arch/amd64/include/proc.h +++ b/sys/arch/amd64/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.5 2011/03/18 03:10:47 guenther Exp $ */ +/* $OpenBSD: proc.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: proc.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -32,8 +32,8 @@ * @(#)proc.h 7.1 (Berkeley) 5/15/91 */ -#ifndef _AMD64_PROC_H -#define _AMD64_PROC_H +#ifndef _MACHINE_PROC_H_ +#define _MACHINE_PROC_H_ #include <machine/frame.h> @@ -50,4 +50,4 @@ struct mdproc { #define MDP_USEDFPU 0x0001 /* has used the FPU */ #define MDP_IRET 0x0002 /* return via iret, not sysret */ -#endif /* _AMD64_PROC_H */ +#endif /* _MACHINE_PROC_H_ */ diff --git a/sys/arch/amd64/include/psl.h b/sys/arch/amd64/include/psl.h index 081c7152e53..c409bc18e97 100644 --- a/sys/arch/amd64/include/psl.h +++ b/sys/arch/amd64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.3 2007/02/11 20:29:20 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: psl.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)psl.h 5.2 (Berkeley) 1/18/91 */ -#ifndef _X86_PSL_H_ -#define _X86_PSL_H_ +#ifndef _MACHINE_PSL_H_ +#define _MACHINE_PSL_H_ /* * 386 processor status longword. @@ -77,4 +77,4 @@ #include <machine/intr.h> #endif -#endif /* !_X86_PSL_H_ */ +#endif /* !_MACHINE_PSL_H_ */ diff --git a/sys/arch/amd64/include/pte.h b/sys/arch/amd64/include/pte.h index c8431fd1fb0..526a695b008 100644 --- a/sys/arch/amd64/include/pte.h +++ b/sys/arch/amd64/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.7 2010/05/08 16:54:07 oga Exp $ */ +/* $OpenBSD: pte.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pte.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $ */ /* @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_PTE_H_ -#define _AMD64_PTE_H_ +#ifndef _MACHINE_PTE_H_ +#define _MACHINE_PTE_H_ /* * amd64 MMU hardware structure: @@ -144,4 +144,4 @@ typedef u_int64_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 /* _AMD64_PTE_H_ */ +#endif /* _MACHINE_PTE_H_ */ diff --git a/sys/arch/amd64/include/rbus_machdep.h b/sys/arch/amd64/include/rbus_machdep.h index 57e99a8383f..7e5dc1e58f7 100644 --- a/sys/arch/amd64/include/rbus_machdep.h +++ b/sys/arch/amd64/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.6 2010/01/13 09:10:33 jsg Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.7 2011/03/23 16:54:34 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 _AMD64_RBUS_MACHDEP_H_ -#define _AMD64_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 /* _AMD64_RBUS_MACHDEP_H_ */ +#endif /* _MACHINE_RBUS_MACHDEP_H_ */ diff --git a/sys/arch/amd64/include/reg.h b/sys/arch/amd64/include/reg.h index 1cd569d0d80..ee50e0bfdc9 100644 --- a/sys/arch/amd64/include/reg.h +++ b/sys/arch/amd64/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.5 2009/12/25 20:54:48 miod Exp $ */ +/* $OpenBSD: reg.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: reg.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)reg.h 5.5 (Berkeley) 1/18/91 */ -#ifndef _AMD64_REG_H_ -#define _AMD64_REG_H_ +#ifndef _MACHINE_REG_H_ +#define _MACHINE_REG_H_ #include <machine/fpu.h> @@ -124,4 +124,4 @@ struct fpreg { int check_context(const struct reg *, struct trapframe *); #endif -#endif /* !_AMD64_REG_H_ */ +#endif /* !_MACHINE_REG_H_ */ diff --git a/sys/arch/amd64/include/reloc.h b/sys/arch/amd64/include/reloc.h index 09df798135c..7eedfc94d2f 100644 --- a/sys/arch/amd64/include/reloc.h +++ b/sys/arch/amd64/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:34 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(R_X86_64_,X) #define R_X86_64_NONE 0 @@ -53,4 +53,4 @@ #define R_X86_64_GOTTPOFF 22 #define R_X86_64_TPOFF32 23 -#endif /* _MACH_RELOC_H */ +#endif /* _MACHINE_RELOC_H_ */ diff --git a/sys/arch/amd64/include/segments.h b/sys/arch/amd64/include/segments.h index 1325f2cd0c6..56f23480738 100644 --- a/sys/arch/amd64/include/segments.h +++ b/sys/arch/amd64/include/segments.h @@ -1,4 +1,4 @@ -/* $OpenBSD: segments.h,v 1.9 2010/11/20 20:11:17 miod Exp $ */ +/* $OpenBSD: segments.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: segments.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $ */ /*- @@ -47,8 +47,8 @@ * William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989 */ -#ifndef _AMD64_SEGMENTS_H_ -#define _AMD64_SEGMENTS_H_ +#ifndef _MACHINE_SEGMENTS_H_ +#define _MACHINE_SEGMENTS_H_ /* * Selectors @@ -279,4 +279,4 @@ void cpu_init_idt(void); #define VALID_USER_DSEL(s) \ ((s) == GSEL(GUDATA_SEL, SEL_UPL)) -#endif /* _AMD64_SEGMENTS_H_ */ +#endif /* _MACHINE_SEGMENTS_H_ */ diff --git a/sys/arch/amd64/include/signal.h b/sys/arch/amd64/include/signal.h index 30b3850f6a5..88dfc97cecf 100644 --- a/sys/arch/amd64/include/signal.h +++ b/sys/arch/amd64/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.5 2006/01/08 14:20:17 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: signal.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $ */ /* @@ -32,8 +32,8 @@ * @(#)signal.h 7.16 (Berkeley) 3/17/91 */ -#ifndef _AMD64_SIGNAL_H_ -#define _AMD64_SIGNAL_H_ +#ifndef _MACHINE_SIGNAL_H_ +#define _MACHINE_SIGNAL_H_ #include <sys/cdefs.h> @@ -85,4 +85,4 @@ struct sigcontext { int sc_mask; }; #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */ -#endif /* !_AMD64_SIGNAL_H_ */ +#endif /* !_MACHINE_SIGNAL_H_ */ diff --git a/sys/arch/amd64/include/stdarg.h b/sys/arch/amd64/include/stdarg.h index 9e97937198c..cfffc33e2a9 100644 --- a/sys/arch/amd64/include/stdarg.h +++ b/sys/arch/amd64/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.7 2010/12/30 05:01:36 tedu Exp $ */ +/* $OpenBSD: stdarg.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: stdarg.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $ */ /*- @@ -32,8 +32,8 @@ * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _AMD64_STDARG_H_ -#define _AMD64_STDARG_H_ +#ifndef _MACHINE_STDARG_H_ +#define _MACHINE_STDARG_H_ #include <sys/cdefs.h> #include <machine/_types.h> /* for __va_list */ @@ -60,4 +60,4 @@ typedef __va_list va_list; #define va_end(ap) -#endif /* !_AMD64_STDARG_H_ */ +#endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/arch/amd64/include/sysarch.h b/sys/arch/amd64/include/sysarch.h index 69f5d9046ff..92e50db5848 100644 --- a/sys/arch/amd64/include/sysarch.h +++ b/sys/arch/amd64/include/sysarch.h @@ -1,8 +1,8 @@ -/* $OpenBSD: sysarch.h,v 1.6 2011/03/18 03:10:47 guenther Exp $ */ +/* $OpenBSD: sysarch.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: sysarch.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $ */ -#ifndef _AMD64_SYSARCH_H_ -#define _AMD64_SYSARCH_H_ +#ifndef _MACHINE_SYSARCH_H_ +#define _MACHINE_SYSARCH_H_ /* * Architecture specific syscalls (amd64) @@ -73,4 +73,4 @@ int amd64_pmc_read(struct amd64_pmc_read_args *); int sysarch(int, void *); #endif -#endif /* !_AMD64_SYSARCH_H_ */ +#endif /* !_MACHINE_SYSARCH_H_ */ diff --git a/sys/arch/amd64/include/tss.h b/sys/arch/amd64/include/tss.h index f3ee6fdf705..d63d6bf062e 100644 --- a/sys/arch/amd64/include/tss.h +++ b/sys/arch/amd64/include/tss.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tss.h,v 1.3 2010/11/20 20:11:17 miod Exp $ */ +/* $OpenBSD: tss.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: tss.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $ */ /* @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _AMD64_TSS_H_ -#define _AMD64_TSS_H_ +#ifndef _MACHINE_TSS_H_ +#define _MACHINE_TSS_H_ /* * TSS structure. Since TSS hw switching is not supported in long @@ -59,4 +59,4 @@ struct x86_64_tss { u_int16_t tss_iobase; } __packed; -#endif /* _AMD64_TSS_H_ */ +#endif /* _MACHINE_TSS_H_ */ diff --git a/sys/arch/amd64/include/vga_post.h b/sys/arch/amd64/include/vga_post.h index 36a9a2d4680..00dab5c0a78 100644 --- a/sys/arch/amd64/include/vga_post.h +++ b/sys/arch/amd64/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:34 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/amd64/include/vmparam.h b/sys/arch/amd64/include/vmparam.h index be67a9bf016..13cb27f9edd 100644 --- a/sys/arch/amd64/include/vmparam.h +++ b/sys/arch/amd64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.13 2010/12/15 05:30:19 tedu Exp $ */ +/* $OpenBSD: vmparam.h,v 1.14 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: vmparam.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $ */ /*- @@ -35,8 +35,8 @@ * @(#)vmparam.h 5.9 (Berkeley) 5/12/91 */ -#ifndef _VMPARAM_H_ -#define _VMPARAM_H_ +#ifndef _MACHINE_VMPARAM_H_ +#define _MACHINE_VMPARAM_H_ /* * Machine dependent constants for amd64. @@ -125,4 +125,4 @@ struct vm_page_md { (pg)->mdpage.pv_list = NULL; \ } while (0) -#endif /* _VMPARAM_H_ */ +#endif /* _MACHINE_VMPARAM_H_ */ |