summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/include/aout_machdep.h8
-rw-r--r--sys/arch/vax/include/atomic.h8
-rw-r--r--sys/arch/vax/include/bus.h8
-rw-r--r--sys/arch/vax/include/cpu.h8
-rw-r--r--sys/arch/vax/include/db_machdep.h8
-rw-r--r--sys/arch/vax/include/exec.h8
-rw-r--r--sys/arch/vax/include/float.h8
-rw-r--r--sys/arch/vax/include/frame.h6
-rw-r--r--sys/arch/vax/include/intr.h6
-rw-r--r--sys/arch/vax/include/ka630.h8
-rw-r--r--sys/arch/vax/include/lock.h8
-rw-r--r--sys/arch/vax/include/macros.h8
-rw-r--r--sys/arch/vax/include/mtpr.h8
-rw-r--r--sys/arch/vax/include/nexus.h8
-rw-r--r--sys/arch/vax/include/param.h8
-rw-r--r--sys/arch/vax/include/pcb.h8
-rw-r--r--sys/arch/vax/include/pmap.h8
-rw-r--r--sys/arch/vax/include/pte.h6
-rw-r--r--sys/arch/vax/include/reg.h8
-rw-r--r--sys/arch/vax/include/signal.h8
-rw-r--r--sys/arch/vax/include/stdarg.h8
-rw-r--r--sys/arch/vax/include/trap.h8
-rw-r--r--sys/arch/vax/include/uvax.h6
-rw-r--r--sys/arch/vax/include/varargs.h8
-rw-r--r--sys/arch/vax/include/vaxfp.h8
-rw-r--r--sys/arch/vax/include/vmparam.h11
-rw-r--r--sys/arch/vax/include/vsbus.h8
27 files changed, 105 insertions, 106 deletions
diff --git a/sys/arch/vax/include/aout_machdep.h b/sys/arch/vax/include/aout_machdep.h
index f84e2a379ff..a2e78959ec9 100644
--- a/sys/arch/vax/include/aout_machdep.h
+++ b/sys/arch/vax/include/aout_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aout_machdep.h,v 1.3 2001/11/14 14:38:33 hugh Exp $ */
+/* $OpenBSD: aout_machdep.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: aout_machdep.h,v 1.4 1995/09/23 14:57:40 ragge Exp $ */
/*
@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_EXEC_H_
-#define _VAX_EXEC_H_
+#ifndef _MACHINE_AOUT_MACHDEP_H_
+#define _MACHINE_AOUT_MACHDEP_H_
#define __LDPGSZ 4096
@@ -47,4 +47,4 @@ struct relocation_info_vax {
};
#define relocation_info relocation_info_vax
-#endif /* _VAX_EXEC_H_ */
+#endif /* _MACHINE_AOUT_MACHDEP_H_ */
diff --git a/sys/arch/vax/include/atomic.h b/sys/arch/vax/include/atomic.h
index 4166463158e..4ff15e2e49c 100644
--- a/sys/arch/vax/include/atomic.h
+++ b/sys/arch/vax/include/atomic.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:26 deraadt Exp $ */
+/* $OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */
/* Public Domain */
-#ifndef __VAX_ATOMIC_H__
-#define __VAX_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
#if defined(_KERNEL)
@@ -31,4 +31,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
}
#endif /* defined(_KERNEL) */
-#endif /* __VAX_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index cf0ffaf2180..6ab4071d5f8 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.15 2010/04/04 12:49:30 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.16 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $ */
/*-
@@ -62,8 +62,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_BUS_H_
-#define _VAX_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
/*
* Bus address and size types
@@ -965,4 +965,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 /* _VAX_BUS_DMA_PRIVATE */
-#endif /* _VAX_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index e2b276e805c..924a18c8419 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.36 2010/09/28 20:27:56 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.37 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */
/*
@@ -31,8 +31,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_CPU_H_
-#define _VAX_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
#ifdef _KERNEL
#include <sys/cdefs.h>
@@ -176,4 +176,4 @@ int kdbrint(int);
{ "led_blink", CTLTYPE_INT } \
}
-#endif /* _VAX_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index 08917d010e1..0d592a43ba1 100644
--- a/sys/arch/vax/include/db_machdep.h
+++ b/sys/arch/vax/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.13 2010/11/27 19:57:23 miod Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $ */
/*
@@ -27,8 +27,8 @@
* the rights to redistribute these changes.
*/
-#ifndef _VAX_DB_MACHDEP_H_
-#define _VAX_DB_MACHDEP_H_
+#ifndef _MACHINE_DB_MACHDEP_H_
+#define _MACHINE_DB_MACHDEP_H_
/*
* Machine-dependent defines for new kernel debugger.
@@ -78,4 +78,4 @@ void kdb_trap(struct trapframe *);
*/
#define DB_AOUT_SYMBOLS
-#endif /* _VAX_DB_MACHDEP_H_ */
+#endif /* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h
index 67900f666d5..d073a46013b 100644
--- a/sys/arch/vax/include/exec.h
+++ b/sys/arch/vax/include/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.8 2008/03/30 18:24:30 miod Exp $ */
+/* $OpenBSD: exec.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: exec.h,v 1.4 1995/09/23 14:57:40 ragge Exp $ */
/*
@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_EXEC_H_
-#define _VAX_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
#define __LDPGSZ 4096
@@ -59,4 +59,4 @@ struct relocation_info_vax {
#define ELF_TARG_DATA ELFDATA2LSB
#define ELF_TARG_MACH EM_VAX
-#endif /* _VAX_EXEC_H_ */
+#endif /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
index c9f76c10468..ceb63589fbd 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.7 2008/07/21 20:50:55 martynas Exp $ */
+/* $OpenBSD: float.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $ */
/*
@@ -32,8 +32,8 @@
* @(#)float.h 7.2 (Berkeley) 6/28/90
*/
-#ifndef _VAX_FLOAT_H_
-#define _VAX_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
#define FLT_RADIX 2 /* b */
#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
@@ -73,4 +73,4 @@
#define LDBL_MAX DBL_MAX
#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#endif /* _VAX_FLOAT_H_ */
+#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/vax/include/frame.h b/sys/arch/vax/include/frame.h
index f83892f8195..7d339843075 100644
--- a/sys/arch/vax/include/frame.h
+++ b/sys/arch/vax/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.3 2001/08/25 13:33:36 hugh Exp $ */
+/* $OpenBSD: frame.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: frame.h,v 1.2 2000/06/04 19:30:15 matt Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -31,8 +31,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_FRAME_H_
-#define _VAX_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define _MACHINE_FRAME_H_
/*
* Description of calls frame on stack. This is the
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 39ccf31ad00..0b427659ac0 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.13 2010/12/21 14:56:24 claudio Exp $ */
+/* $OpenBSD: intr.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -30,8 +30,8 @@
* SUCH DAMAGE.
*/
-#ifndef _VAX_INTR_H_
-#define _VAX_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
/* Define the various Interrupt Priority Levels */
diff --git a/sys/arch/vax/include/ka630.h b/sys/arch/vax/include/ka630.h
index 9bce6065483..cd6e32914d9 100644
--- a/sys/arch/vax/include/ka630.h
+++ b/sys/arch/vax/include/ka630.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka630.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
+/* $OpenBSD: ka630.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: ka630.h,v 1.5 2000/07/19 01:01:58 matt Exp $ */
/*-
* Copyright (c) 1986, 1988 The Regents of the University of California.
@@ -31,8 +31,8 @@
* @(#)uvaxII.h 7.4 (Berkeley) 5/9/91
*/
-#ifndef _VAX_INCLUDE_KA630_H_
-#define _VAX_INCLUDE_KA630_H_
+#ifndef _MACHINE_KA630_H_
+#define _MACHINE_KA630_H_
#define UVAXIISID ((u_long *)0x20040004)
#define UVAXIICPU ((struct uvaxIIcpu *)0x20080000)
@@ -131,5 +131,5 @@ struct ka630clock {
#define KA630_MINCOL 0x51
#define KA630_MAXCOL 0x52
-#endif /* _VAX_INCLUDE_KA630_H_ */
+#endif /* _MACHINE_KA630_H_ */
diff --git a/sys/arch/vax/include/lock.h b/sys/arch/vax/include/lock.h
index 364b430f0ff..37deaf4b399 100644
--- a/sys/arch/vax/include/lock.h
+++ b/sys/arch/vax/include/lock.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: lock.h,v 1.2 2010/04/21 03:03:26 deraadt Exp $ */
+/* $OpenBSD: lock.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $ */
/* public domain */
-#ifndef _VAX_LOCK_H_
-#define _VAX_LOCK_H_
+#ifndef _MACHINE_LOCK_H_
+#define _MACHINE_LOCK_H_
#include <machine/atomic.h>
@@ -53,4 +53,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
*l = __SIMPLELOCK_UNLOCKED;
}
-#endif /* _VAX_LOCK_H_ */
+#endif /* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index b39d64c9228..3a700c5237d 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: macros.h,v 1.16 2009/08/19 19:47:51 miod Exp $ */
+/* $OpenBSD: macros.h,v 1.17 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: macros.h,v 1.20 2000/07/19 01:02:52 matt Exp $ */
/*
@@ -33,8 +33,8 @@
/* All bugs are subject to removal without further notice */
-#if !defined(_VAX_MACROS_H_) && !defined(lint)
-#define _VAX_MACROS_H_
+#if !defined(_MACHINE_MACROS_H_) && !defined(lint)
+#define _MACHINE_MACROS_H_
/* Here general macros are supposed to be stored */
@@ -209,4 +209,4 @@ remqhi(void *header) {
#define Q_EMPTY 0 /* Queue is/was empty */
#define Q_OK 1 /* Inserted OK */
-#endif /* _VAX_MACROS_H_ */
+#endif /* _MACHINE_MACROS_H_ */
diff --git a/sys/arch/vax/include/mtpr.h b/sys/arch/vax/include/mtpr.h
index f41e3474b38..9aa610f86ab 100644
--- a/sys/arch/vax/include/mtpr.h
+++ b/sys/arch/vax/include/mtpr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtpr.h,v 1.5 2000/04/26 03:08:42 bjc Exp $ */
+/* $OpenBSD: mtpr.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: mtpr.h,v 1.12 1999/06/06 19:06:29 ragge Exp $ */
/*
@@ -33,8 +33,8 @@
/* All bugs are subject to removal without further notice */
-#ifndef _VAX_MTPR_H_
-#define _VAX_MTPR_H_
+#ifndef _MACHINE_MTPR_H_
+#define _MACHINE_MTPR_H_
/******************************************************************************
@@ -175,4 +175,4 @@
})
#endif /* _LOCORE */
-#endif /* _VAX_MTPR_H_ */
+#endif /* _MACHINE_MTPR_H_ */
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h
index fe2101f5f53..9d844dc9a57 100644
--- a/sys/arch/vax/include/nexus.h
+++ b/sys/arch/vax/include/nexus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nexus.h,v 1.14 2008/08/18 23:19:24 miod Exp $ */
+/* $OpenBSD: nexus.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: nexus.h,v 1.17 2000/06/04 17:58:19 ragge Exp $ */
/*-
@@ -32,8 +32,8 @@
* @(#)nexus.h 7.3 (Berkeley) 5/9/91
*/
-#ifndef _VAX_NEXUS_H_
-#define _VAX_NEXUS_H_
+#ifndef _MACHINE_NEXUS_H_
+#define _MACHINE_NEXUS_H_
#include <machine/bus.h>
@@ -194,4 +194,4 @@ struct bp_conf {
#define MCHK_PANIC -1
#define MCHK_RECOVERED 0
-#endif /* _VAX_NEXUS_H_ */
+#endif /* _MACHINE_NEXUS_H_ */
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 6069808dc04..aee4ea40275 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.34 2008/08/14 11:41:30 martin Exp $ */
+/* $OpenBSD: param.h,v 1.35 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -34,8 +34,8 @@
* @(#)param.h 5.8 (Berkeley) 6/28/91
*/
-#ifndef _VAX_PARAM_H_
-#define _VAX_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
/*
* Machine dependent constants for VAX.
@@ -140,4 +140,4 @@ void delay(int);
#define DELAY(x) delay(x)
#endif /* _KERNEL */
-#endif /* _VAX_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/vax/include/pcb.h b/sys/arch/vax/include/pcb.h
index 4f1f787aa42..36fa056984f 100644
--- a/sys/arch/vax/include/pcb.h
+++ b/sys/arch/vax/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.6 2003/11/10 21:05:06 miod Exp $ */
+/* $OpenBSD: pcb.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: pcb.h,v 1.10 1996/02/02 18:08:26 mycroft Exp $ */
/*
@@ -33,8 +33,8 @@
/* All bugs are subject to removal without further notice */
-#ifndef _VAX_PCB_H_
-#define _VAX_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
#include <machine/reg.h>
#include <machine/pte.h>
@@ -70,5 +70,5 @@ struct md_coredump {
struct reg md_reg;
};
-#endif /* _VAX_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index dfa1568180d..4ae2a3c290b 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.31 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.32 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */
/*
@@ -40,8 +40,8 @@
*/
-#ifndef PMAP_H
-#define PMAP_H
+#ifndef _MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
#ifdef _KERNEL
@@ -146,4 +146,4 @@ void pmap_pinit(pmap_t);
#endif /* _KERNEL */
-#endif /* PMAP_H */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/vax/include/pte.h b/sys/arch/vax/include/pte.h
index ba91f1faf6e..ef979991aab 100644
--- a/sys/arch/vax/include/pte.h
+++ b/sys/arch/vax/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.10 2006/07/25 21:05:31 miod Exp $ */
+/* $OpenBSD: pte.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: pte.h,v 1.21 2005/12/24 22:45:40 perry Exp $ */
/*
@@ -31,8 +31,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_PTE_H_
-#define _VAX_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define _MACHINE_PTE_H_
#ifndef _LOCORE
diff --git a/sys/arch/vax/include/reg.h b/sys/arch/vax/include/reg.h
index b04552f8165..5940bcec204 100644
--- a/sys/arch/vax/include/reg.h
+++ b/sys/arch/vax/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.3 2000/10/09 23:11:57 bjc Exp $ */
+/* $OpenBSD: reg.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: reg.h,v 1.3 1995/04/12 15:26:52 ragge Exp $ */
/*
@@ -33,8 +33,8 @@
/* All bugs are subject to removal without further notice */
-#ifndef _VAX_REG_H_
-#define _VAX_REG_H_
+#ifndef _MACHINE_REG_H_
+#define _MACHINE_REG_H_
struct reg {
int r0; /* General registers saved upon trap/syscall */
@@ -56,4 +56,4 @@ struct reg {
int psl; /* User psl */
};
-#endif /* _VAX_REG_H_ */
+#endif /* _MACHINE_REG_H_ */
diff --git a/sys/arch/vax/include/signal.h b/sys/arch/vax/include/signal.h
index 3101c749350..65f8a520838 100644
--- a/sys/arch/vax/include/signal.h
+++ b/sys/arch/vax/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.6 2009/06/20 21:02:13 miod Exp $ */
+/* $OpenBSD: signal.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: signal.h,v 1.4 1995/01/10 19:01:52 jtc Exp $ */
/*
@@ -34,8 +34,8 @@
/* All bugs are subject to removal without further notice */
-#ifndef _VAX_SIGNAL_H_
-#define _VAX_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
#include <sys/cdefs.h>
@@ -60,4 +60,4 @@ struct sigcontext {
int sc_r[12]; /* registers to restore */
};
#endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif /* !_VAX_SIGNAL_H_ */
+#endif /* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index 73e6fcd1558..2f55b8a9398 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.10 2008/10/23 21:25:08 kettenis Exp $ */
+/* $OpenBSD: stdarg.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: stdarg.h,v 1.11 1999/05/03 16:30:34 christos Exp $ */
/*-
@@ -32,8 +32,8 @@
* @(#)stdarg.h 7.2 (Berkeley) 5/4/91
*/
-#ifndef _VAX_STDARG_H_
-#define _VAX_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define _MACHINE_STDARG_H_
#include <sys/cdefs.h>
#include <machine/_types.h>
@@ -64,4 +64,4 @@ typedef __va_list va_list;
#define va_end(ap)
-#endif /* !_VAX_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h
index 5537927f304..50d2a39d90e 100644
--- a/sys/arch/vax/include/trap.h
+++ b/sys/arch/vax/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.12 2003/06/02 23:27:57 millert Exp $ */
+/* $OpenBSD: trap.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: trap.h,v 1.18 2000/06/04 02:19:26 matt Exp $ */
/*-
@@ -39,8 +39,8 @@
* Trap type values
* also known in trap.c for name strings
*/
-#ifndef _VAX_TRAP_H_
-#define _VAX_TRAP_H_
+#ifndef _MACHINE_TRAP_H_
+#define _MACHINE_TRAP_H_
#define T_RESADFLT 0 /* reserved addressing */
#define T_PRIVINFLT 1 /* privileged instruction */
@@ -90,4 +90,4 @@ struct trapframe {
#endif /* _LOCORE */
-#endif /* _VAX_TRAP_H_ */
+#endif /* _MACHINE_TRAP_H_ */
diff --git a/sys/arch/vax/include/uvax.h b/sys/arch/vax/include/uvax.h
index 9d65eb9e909..fe113862173 100644
--- a/sys/arch/vax/include/uvax.h
+++ b/sys/arch/vax/include/uvax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvax.h,v 1.5 2002/09/21 13:42:43 hugh Exp $ */
+/* $OpenBSD: uvax.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: uvax.h,v 1.5 1999/02/02 18:37:22 ragge Exp $ */
/*
* Copyright (c) 2002 Hugh Graham.
@@ -34,8 +34,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _VAX_UVAX_H_
-#define _VAX_UVAX_H_
+#ifndef _MACHINE_UVAX_H_
+#define _MACHINE_UVAX_H_
/*
* Generic definitions common on all MicroVAXen clock chip.
diff --git a/sys/arch/vax/include/varargs.h b/sys/arch/vax/include/varargs.h
index a235faa6468..c5593e0da1e 100644
--- a/sys/arch/vax/include/varargs.h
+++ b/sys/arch/vax/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
+/* $OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: varargs.h,v 1.9 1995/12/26 01:16:35 mycroft Exp $ */
/*-
@@ -32,8 +32,8 @@
* @(#)varargs.h 5.3 (Berkeley) 4/3/91
*/
-#ifndef _VAX_VARARGS_H_
-#define _VAX_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define _MACHINE_VARARGS_H_
#include <machine/stdarg.h>
@@ -50,4 +50,4 @@
#define va_start(ap) \
((ap) = (va_list)&__builtin_va_alist)
-#endif /* !_VAX_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/vax/include/vaxfp.h b/sys/arch/vax/include/vaxfp.h
index 39a0fb15021..2b3407faab6 100644
--- a/sys/arch/vax/include/vaxfp.h
+++ b/sys/arch/vax/include/vaxfp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vaxfp.h,v 1.1 2008/07/21 21:50:06 martynas Exp $ */
+/* $OpenBSD: vaxfp.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: vaxfp.h,v 1.7 2008/04/28 20:23:39 martin Exp $ */
/*-
@@ -35,8 +35,8 @@
* Only F_floating and D_floating types are defined here;
* G_floating and H_floating are not supported by OpenBSD.
*/
-#ifndef _VAX_VAXFP_H_
-#define _VAX_VAXFP_H_
+#ifndef _MACHINE_VAXFP_H_
+#define _MACHINE_VAXFP_H_
#define FFLT_EXPBITS 8
#define FFLT_FRACHBITS 7
@@ -83,4 +83,4 @@ union vax_dfloating_u {
struct vax_d_floating dfltu_dflt;
};
-#endif /* _VAX_VAXFP_H_ */
+#endif /* _MACHINE_VAXFP_H_ */
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 40e41933392..b8ac6f284ae 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.29 2008/06/24 21:24:03 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.30 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $ */
/*-
@@ -36,8 +36,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 VAX.
@@ -47,8 +47,7 @@
* USRTEXT is the start of the user text/data space, while USRSTACK
* is the top (end) of the user stack. Immediately above the user stack
* resides kernel.
- *
- */
+ * */
#define USRTEXT NBPG
#define USRSTACK KERNBASE
@@ -123,4 +122,4 @@ struct vm_page_md {
(pg)->mdpage.pv_attr = 0; \
} while (0)
-#endif
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/vax/include/vsbus.h b/sys/arch/vax/include/vsbus.h
index b34ead53776..38d44444cc2 100644
--- a/sys/arch/vax/include/vsbus.h
+++ b/sys/arch/vax/include/vsbus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsbus.h,v 1.9 2006/12/13 21:11:23 miod Exp $ */
+/* $OpenBSD: vsbus.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: vsbus.h,v 1.13 2000/06/25 16:00:46 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -38,8 +38,8 @@
* used by all VAXstations.
*/
-#ifndef _VAX_VSBUS_H_
-#define _VAX_VSBUS_H_
+#ifndef _MACHINE_VSBUS_H_
+#define _MACHINE_VSBUS_H_
#include <machine/bus.h>
#include <machine/sgmap.h>
@@ -105,4 +105,4 @@ void vsbus_copyfromproc(struct proc *, caddr_t, caddr_t, int);
void vsbus_dma_start(struct vsbus_dma *);
void vsbus_dma_intr(void);
#endif
-#endif /* _VAX_VSBUS_H_ */
+#endif /* _MACHINE_VSBUS_H_ */