diff options
Diffstat (limited to 'sys/arch/alpha')
29 files changed, 114 insertions, 114 deletions
diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h index 471b7c96f1a..47a9f374a9a 100644 --- a/sys/arch/alpha/include/_types.h +++ b/sys/arch/alpha/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.11 2009/11/04 19:14:09 kettenis Exp $ */ +/* $OpenBSD: _types.h,v 1.12 2011/03/23 16:54:33 pirofti Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -32,8 +32,8 @@ * @(#)ansi.h 8.2 (Berkeley) 1/4/94 */ -#ifndef _ALPHA__TYPES_H_ -#define _ALPHA__TYPES_H_ +#ifndef _MACHINE__TYPES_H_ +#define _MACHINE__TYPES_H_ #if defined(_KERNEL) typedef struct label_t { @@ -123,4 +123,4 @@ typedef void * __wctype_t; /* Feature test macros */ #define __HAVE_TIMECOUNTER -#endif /* _ALPHA__TYPES_H_ */ +#endif /* _MACHINE__TYPES_H_ */ diff --git a/sys/arch/alpha/include/alpha_cpu.h b/sys/arch/alpha/include/alpha_cpu.h index 2d33fcf9636..2ea5009662d 100644 --- a/sys/arch/alpha/include/alpha_cpu.h +++ b/sys/arch/alpha/include/alpha_cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: alpha_cpu.h,v 1.9 2009/01/17 18:30:08 miod Exp $ */ +/* $OpenBSD: alpha_cpu.h,v 1.10 2011/03/23 16:54:33 pirofti Exp $ */ /* $NetBSD: alpha_cpu.h,v 1.43 2001/12/18 04:18:22 thorpej Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef __ALPHA_ALPHA_CPU_H__ -#define __ALPHA_ALPHA_CPU_H__ +#ifndef _MACHINE_ALPHA_CPU_H_ +#define _MACHINE_ALPHA_CPU_H_ /* * Alpha CPU + OSF/1 PALcode definitions for use by the kernel. @@ -541,4 +541,4 @@ alpha_pal_wrval(unsigned long val) #endif /* _KERNEL */ -#endif /* __ALPHA_ALPHA_CPU_H__ */ +#endif /* _MACHINE_ALPHA_CPU_H_ */ diff --git a/sys/arch/alpha/include/aout_machdep.h b/sys/arch/alpha/include/aout_machdep.h index 5552f464561..8168f06100c 100644 --- a/sys/arch/alpha/include/aout_machdep.h +++ b/sys/arch/alpha/include/aout_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aout_machdep.h,v 1.2 1997/11/10 15:53:09 niklas Exp $ */ +/* $OpenBSD: aout_machdep.h,v 1.3 2011/03/23 16:54:33 pirofti Exp $ */ /* $NetBSD: aout_machdep.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */ /* @@ -28,12 +28,12 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_EXEC_H_ -#define _ALPHA_EXEC_H_ +#ifndef _MACHINE_AOUT_MACHDEP_H_ +#define _MACHINE_AOUT_MACHDEP_H_ #define cpu_exec_aout_makecmds(p, epp) ENOEXEC /* Size of a page in an object file. */ #define __LDPGSZ 8192 -#endif /* !_ALPHA_EXEC_H_ */ +#endif /* !_MACHINE_AOUT_MACHDEP_H_ */ diff --git a/sys/arch/alpha/include/atomic.h b/sys/arch/alpha/include/atomic.h index 9289e6b58a0..2d1725bcfb9 100644 --- a/sys/arch/alpha/include/atomic.h +++ b/sys/arch/alpha/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.8 2009/04/25 19:14:58 miod Exp $ */ +/* $OpenBSD: atomic.h,v 1.9 2011/03/23 16:54:33 pirofti Exp $ */ /* $NetBSD: atomic.h,v 1.7 2001/12/17 23:34:57 thorpej Exp $ */ /*- @@ -35,8 +35,8 @@ * Misc. `atomic' operations. */ -#ifndef _ALPHA_ATOMIC_H_ -#define _ALPHA_ATOMIC_H_ +#ifndef _MACHINE_ATOMIC_H_ +#define _MACHINE_ATOMIC_H_ #if defined(_KERNEL) @@ -225,4 +225,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v) } #endif /* defined(_KERNEL) */ -#endif /* _ALPHA_ATOMIC_H_ */ +#endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index 6157ac433f9..60d9ee7f264 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.28 2009/12/25 20:52:32 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.29 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_BUS_H_ -#define _ALPHA_BUS_H_ +#ifndef _MACHINE_BUS_H_ +#define _MACHINE_BUS_H_ /* * Addresses (in bus space). @@ -678,4 +678,4 @@ paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs, off_t off, int prot, int flags); #endif /* _ALPHA_BUS_DMA_PRIVATE */ -#endif /* _ALPHA_BUS_H_ */ +#endif /* _MACHINE_BUS_H_ */ diff --git a/sys/arch/alpha/include/bwx.h b/sys/arch/alpha/include/bwx.h index 35864f34507..755713e255f 100644 --- a/sys/arch/alpha/include/bwx.h +++ b/sys/arch/alpha/include/bwx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bwx.h,v 1.5 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: bwx.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: bwx.h,v 1.3 2000/06/08 02:55:37 thorpej Exp $ */ /*- @@ -31,8 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALPHA_BWX_H_ -#define _ALPHA_BWX_H_ +#ifndef _MACHINE_BWX_H_ +#define _MACHINE_BWX_H_ /* * Alpha Byte/Word Extension instructions. @@ -133,4 +133,4 @@ alpha_sextw(u_int16_t a0) return (v0); } -#endif /* _ALPHA_BWX_H_ */ +#endif /* _MACHINE_BWX_H_ */ diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index 44f24f800e9..d7580eb9894 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.42 2010/11/28 21:00:04 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.43 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */ /*- @@ -69,8 +69,8 @@ * @(#)cpu.h 8.4 (Berkeley) 1/5/94 */ -#ifndef _ALPHA_CPU_H_ -#define _ALPHA_CPU_H_ +#ifndef _MACHINE_CPU_H_ +#define _MACHINE_CPU_H_ #ifndef NO_IEEE typedef union alpha_s_float { @@ -414,4 +414,4 @@ void alpha_enable_fp(struct proc *, int); #endif #endif /* _KERNEL */ -#endif /* _ALPHA_CPU_H_ */ +#endif /* _MACHINE_CPU_H_ */ diff --git a/sys/arch/alpha/include/cpuconf.h b/sys/arch/alpha/include/cpuconf.h index cd3e9f5103a..27d898c7bc7 100644 --- a/sys/arch/alpha/include/cpuconf.h +++ b/sys/arch/alpha/include/cpuconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuconf.h,v 1.5 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: cpuconf.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: cpuconf.h,v 1.12 2000/06/08 03:10:06 thorpej Exp $ */ /* @@ -35,8 +35,8 @@ * Copyright (c) 1997 */ -#ifndef _ALPHA_CPUCONF_H_ -#define _ALPHA_CPUCONF_H_ +#ifndef _MACHINE_CPUCONF_H_ +#define _MACHINE_CPUCONF_H_ /* * Platform Specific Information and Function Hooks. @@ -103,4 +103,4 @@ extern const struct cpuinit *platform_lookup(int); extern void platform_not_configured(void); extern void platform_not_supported(void); #endif /* _KERNEL */ -#endif /* ! _ALPHA_CPUCONF_H_ */ +#endif /* ! _MACHINE_CPUCONF_H_ */ diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h index 1d2c3e575f0..87942a1e499 100644 --- a/sys/arch/alpha/include/db_machdep.h +++ b/sys/arch/alpha/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:34 pirofti Exp $ */ /* * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. @@ -24,8 +24,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALPHA_DB_MACHDEP_H_ -#define _ALPHA_DB_MACHDEP_H_ +#ifndef _MACHINE_DB_MACHDEP_H_ +#define _MACHINE_DB_MACHDEP_H_ /* XXX - Need to include vm.h for boolean_t */ #include <uvm/uvm_extern.h> @@ -99,4 +99,4 @@ db_addr_t next_instr_address(db_addr_t, int); #define inst_call db_inst_call #endif -#endif /* _ALPHA_DB_MACHDEP_H_ */ +#endif /* _MACHINE_DB_MACHDEP_H_ */ diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h index 91b09414a0f..50a8417410f 100644 --- a/sys/arch/alpha/include/exec.h +++ b/sys/arch/alpha/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.10 2010/06/30 20:38:49 tedu Exp $ */ +/* $OpenBSD: exec.h,v 1.11 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_EXEC_H_ -#define _ALPHA_EXEC_H_ +#ifndef _MACHINE_EXEC_H_ +#define _MACHINE_EXEC_H_ #define cpu_exec_aout_makecmds(p, epp) ENOEXEC @@ -49,4 +49,4 @@ #define _KERN_DO_ELF64 -#endif /* !_ALPHA_EXEC_H_ */ +#endif /* !_MACHINE_EXEC_H_ */ diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h index 7033150e8b5..ebff790e170 100644 --- a/sys/arch/alpha/include/float.h +++ b/sys/arch/alpha/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:34 pirofti Exp $ */ /* $NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $ */ /* @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _ALPHA_FLOAT_H_ -#define _ALPHA_FLOAT_H_ +#ifndef _MACHINE_FLOAT_H_ +#define _MACHINE_FLOAT_H_ #include <sys/cdefs.h> @@ -73,4 +73,4 @@ __END_DECLS #define LDBL_MAX DBL_MAX #define LDBL_MAX_10_EXP DBL_MAX_10_EXP -#endif /* _ALPHA_FLOAT_H_ */ +#endif /* _MACHINE_FLOAT_H_ */ diff --git a/sys/arch/alpha/include/fpu.h b/sys/arch/alpha/include/fpu.h index 1aa71c1e765..f2183775da1 100644 --- a/sys/arch/alpha/include/fpu.h +++ b/sys/arch/alpha/include/fpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.h,v 1.1 2002/04/28 20:55:14 pvalchev Exp $ */ +/* $OpenBSD: fpu.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: fpu.h,v 1.4 2001/04/26 03:10:46 ross Exp $ */ /*- @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALPHA_FPU_H_ -#define _ALPHA_FPU_H_ +#ifndef _MACHINE_FPU_H_ +#define _MACHINE_FPU_H_ #define _FP_C_DEF(n) (1UL << (n)) diff --git a/sys/arch/alpha/include/frame.h b/sys/arch/alpha/include/frame.h index a05fc112370..6d175157fc6 100644 --- a/sys/arch/alpha/include/frame.h +++ b/sys/arch/alpha/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.3 1996/10/30 22:39:06 niklas Exp $ */ +/* $OpenBSD: frame.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: frame.h,v 1.3 1996/07/11 05:31:32 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_FRAME_H_ -#define _ALPHA_FRAME_H_ +#ifndef _MACHINE_FRAME_H_ +#define _MACHINE_FRAME_H_ #include <machine/alpha_cpu.h> @@ -92,4 +92,4 @@ struct trapframe { unsigned long tf_regs[FRAME_SIZE]; /* See above */ }; -#endif /* _ALPHA_FRAME_H_ */ +#endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/arch/alpha/include/ieeefp.h b/sys/arch/alpha/include/ieeefp.h index a1c87d29f51..d03c01fb9f6 100644 --- a/sys/arch/alpha/include/ieeefp.h +++ b/sys/arch/alpha/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieeefp.h,v 1.5 2007/12/29 16:57:19 miod Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: ieeefp.h,v 1.1 1995/04/29 01:09:17 cgd Exp $ */ /* @@ -6,8 +6,8 @@ * Public domain. */ -#ifndef _ALPHA_IEEEFP_H_ -#define _ALPHA_IEEEFP_H_ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ typedef int fp_except; @@ -50,4 +50,4 @@ typedef enum { FP_RP = 3 /* round toward positive infinity */ } fp_rnd; -#endif /* _ALPHA_IEEEFP_H_ */ +#endif /* _MACHINE_IEEEFP_H_ */ diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index b65f63f05ac..29eae0d7006 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.37 2010/12/21 14:56:23 claudio Exp $ */ +/* $OpenBSD: intr.h,v 1.38 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -58,8 +58,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_INTR_H_ -#define _ALPHA_INTR_H_ +#ifndef _MACHINE_INTR_H_ +#define _MACHINE_INTR_H_ #include <sys/evcount.h> #include <sys/lock.h> @@ -299,4 +299,4 @@ void scb_free(u_long); #define SCB_ALLOC_FAILED ((u_long) -1) #endif /* _KERNEL */ -#endif /* ! _ALPHA_INTR_H_ */ +#endif /* ! _MACHINE_INTR_H_ */ diff --git a/sys/arch/alpha/include/ioctl_fd.h b/sys/arch/alpha/include/ioctl_fd.h index 73f5023a522..81799d55f04 100644 --- a/sys/arch/alpha/include/ioctl_fd.h +++ b/sys/arch/alpha/include/ioctl_fd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ioctl_fd.h,v 1.2 2003/11/08 19:17:28 jmc Exp $ */ +/* $OpenBSD: ioctl_fd.h,v 1.3 2011/03/23 16:54:34 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 _ALPHA_IOCTL_FD_H_ -#define _ALPHA_IOCTL_FD_H_ +#ifndef _MACHINE_IOCTL_FD_H_ +#define _MACHINE_IOCTL_FD_H_ #define FD_FORMAT_VERSION 110 /* used to validate before formatting */ #define FD_MAX_NSEC 36 /* highest known number of spt - allow for */ @@ -126,4 +126,4 @@ struct fd_type { #endif /* FDC_500KBPS */ -#endif /* !_ALPHA_IOCTL_FD_H__ */ +#endif /* !_MACHINE_IOCTL_FD_H__ */ diff --git a/sys/arch/alpha/include/kcore.h b/sys/arch/alpha/include/kcore.h index be8d2244084..37b823fe0f7 100644 --- a/sys/arch/alpha/include/kcore.h +++ b/sys/arch/alpha/include/kcore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kcore.h,v 1.3 2000/11/08 21:27:20 ericj Exp $ */ +/* $OpenBSD: kcore.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: kcore.h,v 1.3 1998/02/14 00:17:57 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_KCORE_H_ -#define _ALPHA_KCORE_H_ +#ifndef _MACHINE_KCORE_H_ +#define _MACHINE_KCORE_H_ typedef struct cpu_kcore_hdr { u_int64_t lev1map_pa; /* PA of Lev1map */ @@ -40,4 +40,4 @@ typedef struct cpu_kcore_hdr { #endif } cpu_kcore_hdr_t; -#endif /* _ALPHA_KCORE_H_ */ +#endif /* _MACHINE_KCORE_H_ */ diff --git a/sys/arch/alpha/include/lock.h b/sys/arch/alpha/include/lock.h index 7b4e7f66303..709ecd7c6cd 100644 --- a/sys/arch/alpha/include/lock.h +++ b/sys/arch/alpha/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.2 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: lock.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: lock.h,v 1.16 2001/12/17 23:34:57 thorpej Exp $ */ /*- @@ -35,8 +35,8 @@ * Machine-dependent spin lock operations. */ -#ifndef _ALPHA_LOCK_H_ -#define _ALPHA_LOCK_H_ +#ifndef _MACHINE_LOCK_H_ +#define _MACHINE_LOCK_H_ typedef __volatile int __cpu_simple_lock_t; @@ -151,4 +151,4 @@ do { \ } while (0) #endif /* MULTIPROCESSOR */ -#endif /* _ALPHA_LOCK_H_ */ +#endif /* _MACHINE_LOCK_H_ */ diff --git a/sys/arch/alpha/include/mutex.h b/sys/arch/alpha/include/mutex.h index e7678d169c1..90f216a2c12 100644 --- a/sys/arch/alpha/include/mutex.h +++ b/sys/arch/alpha/include/mutex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.h,v 1.2 2007/05/10 18:08:13 art Exp $ */ +/* $OpenBSD: mutex.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALPHA_MUTEX_H_ -#define _ALPHA_MUTEX_H_ +#ifndef _MACHINE_MUTEX_H_ +#define _MACHINE_MUTEX_H_ /* * Simple non-mp implementation. @@ -58,4 +58,4 @@ void mtx_init(struct mutex *, int); #define MUTEX_OLDIPL(mtx) (mtx)->mtx_oldipl -#endif /* _ALPHA_MUTEX_H_ */ +#endif /* _MACHINE_MUTEX_H_ */ diff --git a/sys/arch/alpha/include/pcb.h b/sys/arch/alpha/include/pcb.h index 684812f899b..47de4e5ae8e 100644 --- a/sys/arch/alpha/include/pcb.h +++ b/sys/arch/alpha/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.8 2005/10/30 20:55:50 miod Exp $ */ +/* $OpenBSD: pcb.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pcb.h,v 1.5 1996/11/13 22:21:00 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_PCB_H_ -#define _ALPHA_PCB_H_ +#ifndef _MACHINE_PCB_H_ +#define _MACHINE_PCB_H_ #include <machine/frame.h> #include <machine/reg.h> @@ -71,4 +71,4 @@ struct md_coredump { void savectx(struct pcb *); #endif -#endif /* _ALPHA_PCB_H_ */ +#endif /* _MACHINE_PCB_H_ */ diff --git a/sys/arch/alpha/include/pte.h b/sys/arch/alpha/include/pte.h index 4a3aacaeacb..32179c7fdf1 100644 --- a/sys/arch/alpha/include/pte.h +++ b/sys/arch/alpha/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.9 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: pte.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: pte.h,v 1.26 1999/04/09 00:38:11 thorpej Exp $ */ /*- @@ -58,8 +58,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_PTE_H_ -#define _ALPHA_PTE_H_ +#ifndef _MACHINE_PTE_H_ +#define _MACHINE_PTE_H_ /* * Alpha page table entry. @@ -140,4 +140,4 @@ typedef alpha_pt_entry_t pt_entry_t; extern pt_entry_t *kernel_lev1map; /* kernel level 1 page table */ #endif /* _KERNEL */ -#endif /* ! _ALPHA_PTE_H_ */ +#endif /* ! _MACHINE_PTE_H_ */ diff --git a/sys/arch/alpha/include/ptrace.h b/sys/arch/alpha/include/ptrace.h index 81040c1cbf1..7ca5e63a309 100644 --- a/sys/arch/alpha/include/ptrace.h +++ b/sys/arch/alpha/include/ptrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ptrace.h,v 1.4 2002/03/12 11:58:14 art Exp $ */ +/* $OpenBSD: ptrace.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: ptrace.h,v 1.1 1995/02/13 23:07:51 cgd Exp $ */ /* @@ -31,8 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __MACHINE_PTRACE_H__ -#define __MACHINE_PTRACE_H__ +#ifndef _MACHINE_PTRACE_H_ +#define _MACHINE_PTRACE_H_ /* * Alpha-dependent ptrace definitions. diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h index 23d0902cca4..e5812471d4a 100644 --- a/sys/arch/alpha/include/reg.h +++ b/sys/arch/alpha/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: reg.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_REG_H_ -#define _ALPHA_REG_H_ +#ifndef _MACHINE_REG_H_ +#define _MACHINE_REG_H_ /* * XXX where did this info come from? @@ -98,4 +98,4 @@ void frametoreg(struct trapframe *, struct reg *); void regtoframe(struct reg *, struct trapframe *); #endif -#endif /* _ALPHA_REG_H_ */ +#endif /* _MACHINE_REG_H_ */ diff --git a/sys/arch/alpha/include/reloc.h b/sys/arch/alpha/include/reloc.h index 694e84ac65f..5133abb46ce 100644 --- a/sys/arch/alpha/include/reloc.h +++ b/sys/arch/alpha/include/reloc.h @@ -1,7 +1,7 @@ -/* $OpenBSD: reloc.h,v 1.2 2001/07/04 08:41:18 niklas Exp $ */ +/* $OpenBSD: reloc.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ -#ifndef _MACH_RELOC_H_ -#define _MACH_RELOC_H_ +#ifndef _MACHINE_RELOC_H_ +#define _MACHINE_RELOC_H_ #define RELOC_NONE 0 /* No reloc */ #define RELOC_REFLONG 1 /* Direct 32 bit */ @@ -34,4 +34,4 @@ #define R_TYPE(X) __CONCAT(RELOC_,X) -#endif /* _MACH_RELOC_H_ */ +#endif /* _MACHINE_RELOC_H_ */ diff --git a/sys/arch/alpha/include/signal.h b/sys/arch/alpha/include/signal.h index e433a488152..1f446e22e1b 100644 --- a/sys/arch/alpha/include/signal.h +++ b/sys/arch/alpha/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.6 2006/12/11 20:53:23 deraadt Exp $ */ +/* $OpenBSD: signal.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: signal.h,v 1.2 1995/02/16 03:08:08 cgd Exp $ */ /* @@ -28,8 +28,8 @@ * rights to redistribute these changes. */ -#ifndef _ALPHA_SIGNAL_H_ -#define _ALPHA_SIGNAL_H_ +#ifndef _MACHINE_SIGNAL_H_ +#define _MACHINE_SIGNAL_H_ #include <sys/cdefs.h> @@ -61,4 +61,4 @@ struct sigcontext { long sc_xxx[8]; /* XXX */ }; #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */ -#endif /* !_ALPHA_SIGNAL_H_*/ +#endif /* !_MACHINE_SIGNAL_H_*/ diff --git a/sys/arch/alpha/include/stdarg.h b/sys/arch/alpha/include/stdarg.h index 1cb7f986c45..218a0d09aec 100644 --- a/sys/arch/alpha/include/stdarg.h +++ b/sys/arch/alpha/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.12 2010/12/30 05:01:36 tedu Exp $ */ +/* $OpenBSD: stdarg.h,v 1.13 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: stdarg.h,v 1.4 1996/10/09 21:13:05 cgd Exp $ */ /*- @@ -32,8 +32,8 @@ * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 */ -#ifndef _ALPHA_STDARG_H_ -#define _ALPHA_STDARG_H_ +#ifndef _MACHINE_STDARG_H_ +#define _MACHINE_STDARG_H_ #include <sys/cdefs.h> #include <machine/_types.h> @@ -62,4 +62,4 @@ typedef __va_list va_list; #define va_end(ap) -#endif /* !_ALPHA_STDARG_H_ */ +#endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/arch/alpha/include/sysarch.h b/sys/arch/alpha/include/sysarch.h index 9cd3e3608cb..c997e76734d 100644 --- a/sys/arch/alpha/include/sysarch.h +++ b/sys/arch/alpha/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.5 2008/06/26 05:42:08 ray Exp $ */ +/* $OpenBSD: sysarch.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: sysarch.h,v 1.8 2001/04/26 03:10:46 ross Exp $ */ /*- @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ALPHA_SYSARCH_H_ -#define _ALPHA_SYSARCH_H_ +#ifndef _MACHINE_SYSARCH_H_ +#define _MACHINE_SYSARCH_H_ #include <machine/ieeefp.h> @@ -58,4 +58,4 @@ struct alpha_fp_c_args { int sysarch(int, void *); #endif /* _KERNEL */ -#endif /* !_ALPHA_SYSARCH_H_ */ +#endif /* !_MACHINE_SYSARCH_H_ */ diff --git a/sys/arch/alpha/include/varargs.h b/sys/arch/alpha/include/varargs.h index 9d8a5d775ed..404c3397137 100644 --- a/sys/arch/alpha/include/varargs.h +++ b/sys/arch/alpha/include/varargs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:43 millert Exp $ */ +/* $OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: varargs.h,v 1.5 1996/10/09 21:13:05 cgd Exp $ */ /*- @@ -37,8 +37,8 @@ * @(#)varargs.h 8.2 (Berkeley) 3/22/94 */ -#ifndef _ALPHA_VARARGS_H_ -#define _ALPHA_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_saveregs(), (ap).pad = 0) -#endif /* !_ALPHA_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h index 51d25a67632..ebbccb979be 100644 --- a/sys/arch/alpha/include/vmparam.h +++ b/sys/arch/alpha/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.19 2010/12/15 05:30:18 tedu Exp $ */ +/* $OpenBSD: vmparam.h,v 1.20 2011/03/23 16:54:34 pirofti Exp $ */ /* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */ /* @@ -39,8 +39,8 @@ * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 */ -#ifndef _ALPHA_VMPARAM_H_ -#define _ALPHA_VMPARAM_H_ +#ifndef _MACHINE_VMPARAM_H_ +#define _MACHINE_VMPARAM_H_ /* * Machine dependent constants for Alpha. @@ -136,4 +136,4 @@ struct pmap_physseg { struct pv_head *pvhead; /* pv list of this seg */ }; -#endif /* ! _ALPHA_VMPARAM_H_ */ +#endif /* ! _MACHINE_VMPARAM_H_ */ |