#(endif|else) foo is incorrect, make it #endif /* foo */

deraadt@ ok

34 files changed, 73 insertions, 74 deletions

diff --git a/sys/arch/mvme88k/dev/vme.h b/sys/arch/mvme88k/dev/vme.h
index 7c3ad02230b..845366a6979 100644
--- a/sys/arch/mvme88k/dev/vme.h
+++ b/sys/arch/mvme88k/dev/vme.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.h,v 1.5 2001/03/09 05:44:39 smurph Exp $ */
+/*	$OpenBSD: vme.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -380,4 +380,4 @@ int vmeintr_establish __P((int vec, struct intrhand *ih));
 int vme_findvec __P((void));
 int vmescan __P((struct device *, void *, void *, int));
 
-#endif __MVEME88K_DEV_VME_H__
+#endif /* __MVEME88K_DEV_VME_H__ */
diff --git a/sys/arch/mvme88k/include/asm.h b/sys/arch/mvme88k/include/asm.h
index dc179b3f1de..caa9d9e1f7f 100644
--- a/sys/arch/mvme88k/include/asm.h
+++ b/sys/arch/mvme88k/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.11 2001/07/04 08:09:23 niklas Exp $	*/
+/*	$OpenBSD: asm.h,v 1.12 2001/08/12 12:03:02 heko Exp $	*/
 
 /*
  * Mach Operating System
@@ -39,7 +39,7 @@
 /* Define EH_DEBUG to be non-zero to compile-in various debugging things */
 #ifndef	EH_DEBUG
 #define EH_DEBUG 1
-#endif	EH_DEBUG
+#endif /* EH_DEBUG */
 
 #define	ENTRY(NAME) \
     .align 8; .globl FUNC(NAME); FUNC(NAME):
@@ -320,4 +320,4 @@
 #define VME_CMMU_D3		0xFFF7F000 	/* MVME188 data CMMU 3 */
 #endif /* CMMU_DEFS */
 
-#endif __MACHINE_M88K_ASM_H__
+#endif /* __MACHINE_M88K_ASM_H__ */
diff --git a/sys/arch/mvme88k/include/asm_macro.h b/sys/arch/mvme88k/include/asm_macro.h
index e5f340ae8ff..e2f951a21f1 100644
--- a/sys/arch/mvme88k/include/asm_macro.h
+++ b/sys/arch/mvme88k/include/asm_macro.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm_macro.h,v 1.13 2001/08/07 22:18:04 miod Exp $ */
+/*	$OpenBSD: asm_macro.h,v 1.14 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -122,4 +122,4 @@ static __inline__ unsigned ff1(register unsigned val)
 	return val;
 }
 
-#endif __MACHINE_M88K_ASM_MACRO_H__
+#endif /* __MACHINE_M88K_ASM_MACRO_H__ */
diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index 3e2bc8788f2..23c754c0082 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.9 2001/03/07 23:37:15 miod Exp $ */
+/*	$OpenBSD: board.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -118,6 +118,6 @@
 #include <machine/mvme188.h>
 #endif
 
-#endif __MACHINE_BOARD_H__
+#endif /* __MACHINE_BOARD_H__ */
 
 
diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h
index c13c6527f62..fe99ff8a49c 100644
--- a/sys/arch/mvme88k/include/bug.h
+++ b/sys/arch/mvme88k/include/bug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bug.h,v 1.5 2001/01/14 20:25:23 smurph Exp $ */
+/*	$OpenBSD: bug.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
 #ifndef __MACHINE_BUG_H__
 #define __MACHINE_BUG_H__
 #include <machine/bugio.h>
@@ -13,4 +13,4 @@ struct bugenv {
 	char	*argstart;
 	char	*argend;
 };
-#endif __MACHINE_BUG_H__
+#endif /* __MACHINE_BUG_H__ */
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index 2afc6b72ed0..32be8a03ed0 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugio.h,v 1.8 2001/03/09 05:44:40 smurph Exp $ */
+/*	$OpenBSD: bugio.h,v 1.9 2001/08/12 12:03:02 heko Exp $ */
 #ifndef __MACHINE_BUGIO_H__
 #define __MACHINE_BUGIO_H__
 #include "sys/cdefs.h"
@@ -97,5 +97,5 @@ void bugreturn	__P((void));
 int bugfork	__P((int cpu, unsigned address));
 void bugbrdid	__P((struct bugbrdid *));
 void bugnetctrl	__P((struct bugniocall *));
-#endif __MACHINE_BUGIO_H__
+#endif /* __MACHINE_BUGIO_H__ */
 
diff --git a/sys/arch/mvme88k/include/cdefs.h b/sys/arch/mvme88k/include/cdefs.h
index ffd48ba3a8d..b8ddd4d500b 100644
--- a/sys/arch/mvme88k/include/cdefs.h
+++ b/sys/arch/mvme88k/include/cdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdefs.h,v 1.6 2001/01/14 20:25:23 smurph Exp $ */
+/*	$OpenBSD: cdefs.h,v 1.7 2001/08/12 12:03:02 heko Exp $ */
 /*	$NetBSD: cdefs.h,v 1.2 1995/03/23 20:10:48 jtc Exp $	*/
 
 /*
@@ -33,4 +33,4 @@
 #endif
 #endif
 
-#endif __MACHINE_CDEFS_H__
+#endif /* __MACHINE_CDEFS_H__ */
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index f56db0d798c..998ab509111 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.10 2001/07/01 23:27:46 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.11 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -201,4 +201,4 @@ int badvaddr __P((vm_offset_t va, int size));
 void nmihand __P((void *framep));
 
 #endif /* _KERNEL */
-#endif __MACHINE_CPU_H__
+#endif /* __MACHINE_CPU_H__ */
diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h
index e20f68db00f..c24e2297f10 100644
--- a/sys/arch/mvme88k/include/cpus.h
+++ b/sys/arch/mvme88k/include/cpus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpus.h,v 1.7 2001/03/07 23:37:16 miod Exp $ */
+/*	$OpenBSD: cpus.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -56,10 +56,10 @@ union cpupid {
       /*empty*/:16;
    } m88200;
 };
-#endif _LOCORE
+#endif /* _LOCORE */
 
 #define M88100 0
 #define M88200 5
 #define M88204 6
 
-#endif __MACHINE_CPUS_H__
+#endif /* __MACHINE_CPUS_H__ */
diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h
index 7d6ff30314e..60930ba691c 100644
--- a/sys/arch/mvme88k/include/disklabel.h
+++ b/sys/arch/mvme88k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.7 2001/08/11 23:51:50 miod Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1995 Dale Rahn.
@@ -120,5 +120,4 @@ struct cpu_disklabel {
 	u_long		magic2;
 	u_char		cfg_4[192];
 };
-
 #endif /* __MACHINE_DISKLABEL_H__ */
diff --git a/sys/arch/mvme88k/include/endian.h b/sys/arch/mvme88k/include/endian.h
index c975bb410ec..1054b7817c1 100644
--- a/sys/arch/mvme88k/include/endian.h
+++ b/sys/arch/mvme88k/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.11 2001/03/02 20:45:21 jason Exp $ */
+/*	$OpenBSD: endian.h,v 1.12 2001/08/12 12:03:02 heko Exp $ */
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -37,5 +37,5 @@
 
 #define	__STRICT_ALIGNMENT
 
-#endif __MVME88K_ENDIAN_H__
+#endif /* __MVME88K_ENDIAN_H__ */
 
diff --git a/sys/arch/mvme88k/include/exception_vectors.h b/sys/arch/mvme88k/include/exception_vectors.h
index 4dd65941e46..bda2211ee13 100644
--- a/sys/arch/mvme88k/include/exception_vectors.h
+++ b/sys/arch/mvme88k/include/exception_vectors.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exception_vectors.h,v 1.7 2001/01/14 20:25:23 smurph Exp $ */
+/*	$OpenBSD: exception_vectors.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991, 1992 Carnegie Mellon University
@@ -169,4 +169,4 @@
 /* vector 0x85 (#133) */  word   user_raw_putstr /* for USER raw_printf() */
 /* vector 0x85 (#134) */  word   user_raw_xpr 	 /* for USER raw_xpr() */
 #endif
-#endif __MACHINE_EXECPTION_VECTORS_H__
+#endif /* __MACHINE_EXECPTION_VECTORS_H__ */
diff --git a/sys/arch/mvme88k/include/exception_vectors2.h b/sys/arch/mvme88k/include/exception_vectors2.h
index 8a03127b5e8..77c11b41956 100644
--- a/sys/arch/mvme88k/include/exception_vectors2.h
+++ b/sys/arch/mvme88k/include/exception_vectors2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exception_vectors2.h,v 1.2 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: exception_vectors2.h,v 1.3 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991, 1992 Carnegie Mellon University
@@ -164,4 +164,4 @@
 /* vector 0x82 (#130) */  word   _m197_break
 /* vector 0x83 (#131) */  word   _m197_trace
 /* vector 0x84 (#132) */  word   _m197_entry
-#endif __MACHINE_EXECPTION_VECTORS2_H__
+#endif /* __MACHINE_EXECPTION_VECTORS2_H__ */
diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h
index 343fa69ffe2..760e511cfca 100644
--- a/sys/arch/mvme88k/include/exec.h
+++ b/sys/arch/mvme88k/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.9 2001/01/22 14:51:05 art Exp $ */
+/*	$OpenBSD: exec.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */
 #ifndef __MACHINE_EXEC_H__
 #define __MACHINE_EXEC_H__
 
@@ -29,4 +29,4 @@ struct relocation_info_m88k {
 #define _KERN_DO_AOUT
 #define _KERN_DO_ELF
 
-#endif __MACHINE_EXEC_H__
+#endif /* __MACHINE_EXEC_H__ */
diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h
index cd67401ef77..b082b29d064 100644
--- a/sys/arch/mvme88k/include/float.h
+++ b/sys/arch/mvme88k/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.4 2001/01/14 20:25:24 smurph Exp $	*/
+/*	$OpenBSD: float.h,v 1.5 2001/08/12 12:03:02 heko Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -77,4 +77,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif __M88K_FLOAT_H__
+#endif /* __M88K_FLOAT_H__ */
diff --git a/sys/arch/mvme88k/include/ieee.h b/sys/arch/mvme88k/include/ieee.h
index a4801ecd5b2..92e200216ec 100644
--- a/sys/arch/mvme88k/include/ieee.h
+++ b/sys/arch/mvme88k/include/ieee.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee.h,v 1.3 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: ieee.h,v 1.4 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -143,4 +143,4 @@ struct ieee_ext {
 #define	SNG_EXP_BIAS	127
 #define	DBL_EXP_BIAS	1023
 #define	EXT_EXP_BIAS	16383
-#endif __MACHINE_IEEE_H__
+#endif /* __MACHINE_IEEE_H__ */
diff --git a/sys/arch/mvme88k/include/m88100.h b/sys/arch/mvme88k/include/m88100.h
index fd0352d6252..907aef2a1da 100644
--- a/sys/arch/mvme88k/include/m88100.h
+++ b/sys/arch/mvme88k/include/m88100.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88100.h,v 1.7 2001/03/07 23:37:16 miod Exp $ */
+/*	$OpenBSD: m88100.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -73,4 +73,4 @@ struct dmt_reg {
 };
 #endif 
 
-#endif __MACHINE_M88100_H__
+#endif /* __MACHINE_M88100_H__ */
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index c3edb14fd38..391b3aa2813 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.h,v 1.4 2001/03/09 05:44:40 smurph Exp $ */
+/*	$OpenBSD: m88110.h,v 1.5 2001/08/12 12:03:02 heko Exp $ */
 
 #ifndef	__MACHINE_M88110_H__
 #define	__MACHINE_M88110_H__
@@ -232,4 +232,4 @@ unsigned get_dpar (void);
 
 #endif	/* _LOCORE */
 
-#endif __MACHINE_M88110_H__
+#endif /* __MACHINE_M88110_H__ */
diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h
index 14460ad0520..56edd2b6216 100644
--- a/sys/arch/mvme88k/include/mmu.h
+++ b/sys/arch/mvme88k/include/mmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mmu.h,v 1.10 2001/08/07 23:57:58 miod Exp $ */
+/*	$OpenBSD: mmu.h,v 1.11 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Ashura Project
  */
@@ -265,5 +265,5 @@ extern u_int kvtop __P((vm_offset_t));
 #define DMA_CACHE_INV		0x3
 extern void dma_cachectl(vm_offset_t, int, int);
 
-#endif __MACHINE_MMU_H__
+#endif /* __MACHINE_MMU_H__ */
 
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 1fcd40f4485..5f8c06b0de2 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.5 2001/03/16 00:05:25 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -385,6 +385,6 @@ extern volatile unsigned int *int_mask_reg[MAX_CPUS];
 #define M188_IACK		U(0xFFF85000)
 #define M188_IVEC		0x40	/* vector returned upon MVME188 int */
 
-#endif	__MACHINE_MVME188_H__
+#endif /* __MACHINE_MVME188_H__ */
 
 
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index 0374d75b5b5..619bf8f9020 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.4 2001/03/07 23:37:17 miod Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.5 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -100,4 +100,4 @@
 #define M187_IACK	U(0xFFFE0000)
 #define M197_IACK	U(0xFFF00100)
 
-#endif __MACHINE_MVME1X7_H__
+#endif /* __MACHINE_MVME1X7_H__ */
diff --git a/sys/arch/mvme88k/include/pcb.h b/sys/arch/mvme88k/include/pcb.h
index 26c20af5101..285435f96d7 100644
--- a/sys/arch/mvme88k/include/pcb.h
+++ b/sys/arch/mvme88k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.7 2001/01/12 07:29:27 smurph Exp $ */
+/*	$OpenBSD: pcb.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Mach Operating System
@@ -105,4 +105,4 @@ struct md_coredump {
 	struct	trapframe md_tf;
 };
 
-#endif _M88K_PCB_H_
+#endif /* _M88K_PCB_H_ */
diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h
index 56753d3e85f..d3dd661d0b1 100644
--- a/sys/arch/mvme88k/include/pmap_table.h
+++ b/sys/arch/mvme88k/include/pmap_table.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.h,v 1.6 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: pmap_table.h,v 1.7 2001/08/12 12:03:02 heko Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -45,5 +45,5 @@ typedef struct {
 typedef pmap_table_entry *pmap_table_t;
 
 pmap_table_t pmap_table_build __P((unsigned memory_size));
-#endif __MACHINE_PAMP_TABLE_H__
+#endif /* __MACHINE_PAMP_TABLE_H__ */
 
diff --git a/sys/arch/mvme88k/include/proc.h b/sys/arch/mvme88k/include/proc.h
index 7a5dbb54e3b..b6cbaa354e8 100644
--- a/sys/arch/mvme88k/include/proc.h
+++ b/sys/arch/mvme88k/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.7 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: proc.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -43,7 +43,7 @@
  *	@(#)proc.h	8.1 (Berkeley) 6/11/93
  *
  * from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp  (LBL)
- * $Id: proc.h,v 1.7 2001/01/14 20:25:24 smurph Exp $
+ * $Id: proc.h,v 1.8 2001/08/12 12:03:02 heko Exp $
  */
 
 #ifndef __MACHINE_PROC_H__
@@ -63,5 +63,5 @@ struct mdproc {
 	unsigned md_ss_taken_addr;    /* single step address for ptrace */
 	unsigned md_ss_taken_instr;   /* single step instruction for ptrace */
 };
-#endif __MACHINE_PROC_H__
+#endif /* __MACHINE_PROC_H__ */
 
diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h
index 2fff4ff3e88..0bb72be7fb9 100644
--- a/sys/arch/mvme88k/include/profile.h
+++ b/sys/arch/mvme88k/include/profile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: profile.h,v 1.10 2001/03/07 23:38:22 miod Exp $ */
+/*	$OpenBSD: profile.h,v 1.11 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)profile.h	8.1 (Berkeley) 6/11/93
- *	$Id: profile.h,v 1.10 2001/03/07 23:38:22 miod Exp $
+ *	$Id: profile.h,v 1.11 2001/08/12 12:03:02 heko Exp $
  */
 #ifndef __MACHINE_PROFILE_H__
 #define __MACHINE_PROFILE_H__
@@ -73,4 +73,4 @@ mcount()								\
 #define	MCOUNT_ENTER	s = splhigh()
 #define	MCOUNT_EXIT	splx(s)
 #endif /* _KERNEL */
-#endif __MACHINE_PROFILE_H__
+#endif /* __MACHINE_PROFILE_H__ */
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index 418cffd5dff..2b1af80abea 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.7 2001/06/29 21:52:05 miod Exp $ */
+/*	$OpenBSD: prom.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -177,4 +177,4 @@ struct mvmeprom_args {
 #ifndef RB_NOSYM
 #define RB_NOSYM 0x4000
 #endif
-#endif __MACHINE_PROM_H__
+#endif /* __MACHINE_PROM_H__ */
diff --git a/sys/arch/mvme88k/include/ptrace.h b/sys/arch/mvme88k/include/ptrace.h
index 73648c842de..b5022b84acf 100644
--- a/sys/arch/mvme88k/include/ptrace.h
+++ b/sys/arch/mvme88k/include/ptrace.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ptrace.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: ptrace.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
  *
  * from: Header: ptrace.h,v 1.6 92/11/26 02:04:43 torek Exp  (LBL)
- * $Id: ptrace.h,v 1.5 2001/01/14 20:25:24 smurph Exp $
+ * $Id: ptrace.h,v 1.6 2001/08/12 12:03:02 heko Exp $
  */
 
 /*
@@ -57,4 +57,4 @@
 #define	PT_SETREGS	(PT_FIRSTMACH + 2)
 #define	PT_GETFPREGS	(PT_FIRSTMACH + 3)
 #define	PT_SETFPREGS	(PT_FIRSTMACH + 4)
-#endif __MACHINE_PTRACE_H__
+#endif /* __MACHINE_PTRACE_H__ */
diff --git a/sys/arch/mvme88k/include/setjmp.h b/sys/arch/mvme88k/include/setjmp.h
index 86d1247430c..c6418e4045e 100644
--- a/sys/arch/mvme88k/include/setjmp.h
+++ b/sys/arch/mvme88k/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.h,v 1.5 2001/01/14 20:25:24 smurph Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.6 2001/08/12 12:03:02 heko Exp $	*/
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
@@ -6,4 +6,4 @@
 #ifndef __MACHINE_SETJMP_H__
 #define __MACHINE_SETJMP_H__
 #define	_JBLEN	22		/* size, in longs, of a jmp_buf */
-#endif __MACHINE_SETJMP_H__
+#endif /* __MACHINE_SETJMP_H__ */
diff --git a/sys/arch/mvme88k/include/signal.h b/sys/arch/mvme88k/include/signal.h
index 70aa8af7172..817828f11de 100644
--- a/sys/arch/mvme88k/include/signal.h
+++ b/sys/arch/mvme88k/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2001/01/14 20:25:24 smurph Exp $ */
+/*	$OpenBSD: signal.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -75,4 +75,4 @@ struct  sigcontext {
 	int	sc_fpit;
 	int	sc_xxxx;	/* padd to double word boundary */
 };
-#endif __MACHINE_SIGNAL_H__
+#endif /* __MACHINE_SIGNAL_H__ */
diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h
index 236a7be4062..5cbfa8e113a 100644
--- a/sys/arch/mvme88k/include/trap.h
+++ b/sys/arch/mvme88k/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.9 2001/03/12 23:00:48 miod Exp $ */
+/*	$OpenBSD: trap.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -101,5 +101,5 @@ void m197_syscall(register_t code, struct m88100_saved_state *tf);
 #endif /* MVME197 */
 #endif /* _LOCORE */
 
-#endif __MACHINE_TRAP_H__
+#endif /* __MACHINE_TRAP_H__ */
 
diff --git a/sys/arch/mvme88k/include/vid.h b/sys/arch/mvme88k/include/vid.h
index ea179d47f2e..76371b27f84 100644
--- a/sys/arch/mvme88k/include/vid.h
+++ b/sys/arch/mvme88k/include/vid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vid.h,v 1.6 2001/07/04 08:09:24 niklas Exp $	*/
+/*	$OpenBSD: vid.h,v 1.7 2001/08/12 12:03:02 heko Exp $	*/
 
 #ifndef __MACHINE_VID_H__
 #define __MACHINE_VID_H__
@@ -59,4 +59,4 @@ struct cfg {
 	unsigned char	cfg_4[196];
 };
 #endif
-#endif __MACHINE_VID_H__
+#endif /* __MACHINE_VID_H__ */
diff --git a/sys/arch/mvme88k/include/vmparam.h b/sys/arch/mvme88k/include/vmparam.h
index 1019769c438..220db5a3ef2 100644
--- a/sys/arch/mvme88k/include/vmparam.h
+++ b/sys/arch/mvme88k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.13 2001/06/27 06:19:49 art Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.14 2001/08/12 12:03:02 heko Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -162,4 +162,4 @@ struct pmap_physseg {
 };
 #endif /* _LOCORE */
 
-#endif	_MACHINE_VM_PARAM_
+#endif /* _MACHINE_VM_PARAM_ */
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 3b3158d8238..6384cd9570a 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.13 2001/05/20 05:53:09 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.14 2001/08/12 12:03:02 heko Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -1818,7 +1818,7 @@ exception_handler_has_ksp:  global exception_handler_has_ksp
    st    r30,  r31,  0  /* store frame pointer on the stack */
 #if DDB
    st    r30,  r31,  4  /* store it again for the debugger to recognize */
-#endif DDB
+#endif /* DDB */
 
    ld    r2,   r30,  REG_OFF(EF_VECTOR)
    bcnd.n eq0, r2,   return_to_calling_exception_handler  /* is error */
@@ -2950,7 +2950,7 @@ m197_exception_handler_has_ksp:  global m197_exception_handler_has_ksp
    st    r30,  r31,  0  /* store frame pointer on the stack */
 #if DDB
    st    r30,  r31,  4  /* store it again for the debugger to recognize */
-#endif DDB
+#endif /* DDB */
 
    ld    r2,   r30,  REG_OFF(EF_VECTOR)
    bcnd.n eq0, r2,   m197_return_to_calling_exception_handler  /* is error */
diff --git a/sys/arch/mvme88k/stand/wrtvid/disklabel.h b/sys/arch/mvme88k/stand/wrtvid/disklabel.h
index cdbb5f4f060..bdc6d8a82cd 100644
--- a/sys/arch/mvme88k/stand/wrtvid/disklabel.h
+++ b/sys/arch/mvme88k/stand/wrtvid/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.1 1998/08/22 08:54:18 smurph Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.2 2001/08/12 12:03:02 heko Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1995 Dale Rahn.
@@ -31,7 +31,7 @@
  */  
 
 #ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
+#define /* _MACHINE_DISKLABEL_H_ */
 
 /* number of boot pieces , ie xxboot bootxx */
 #define NUMBOOT		2