summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorHeikki Korpela <heko@cvs.openbsd.org>2001-08-12 12:03:04 +0000
committerHeikki Korpela <heko@cvs.openbsd.org>2001-08-12 12:03:04 +0000
commit8733d65e598e20f5a4415a710e9c51ab3a3d323d (patch)
tree39173461770e11f8ad331e9aa18365fc4ab2d19f /sys/arch
parentbbbc80b14c0c9c05eb40dfe595d4893002a710bf (diff)
#(endif|else) foo is incorrect, make it #endif /* foo */
deraadt@ ok
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/db_instruction.h4
-rw-r--r--sys/arch/alpha/alpha/pmap.c4
-rw-r--r--sys/arch/amiga/amiga/cia.h4
-rw-r--r--sys/arch/amiga/stand/boot/amigagraph.h4
-rw-r--r--sys/arch/m68k/m68k/db_trace.c10
-rw-r--r--sys/arch/mac68k/mac68k/disksubr.c10
-rw-r--r--sys/arch/mvme68k/mvme68k/vectors.s4
-rw-r--r--sys/arch/mvme88k/dev/vme.h4
-rw-r--r--sys/arch/mvme88k/include/asm.h6
-rw-r--r--sys/arch/mvme88k/include/asm_macro.h4
-rw-r--r--sys/arch/mvme88k/include/board.h4
-rw-r--r--sys/arch/mvme88k/include/bug.h4
-rw-r--r--sys/arch/mvme88k/include/bugio.h4
-rw-r--r--sys/arch/mvme88k/include/cdefs.h4
-rw-r--r--sys/arch/mvme88k/include/cpu.h4
-rw-r--r--sys/arch/mvme88k/include/cpus.h6
-rw-r--r--sys/arch/mvme88k/include/disklabel.h3
-rw-r--r--sys/arch/mvme88k/include/endian.h4
-rw-r--r--sys/arch/mvme88k/include/exception_vectors.h4
-rw-r--r--sys/arch/mvme88k/include/exception_vectors2.h4
-rw-r--r--sys/arch/mvme88k/include/exec.h4
-rw-r--r--sys/arch/mvme88k/include/float.h4
-rw-r--r--sys/arch/mvme88k/include/ieee.h4
-rw-r--r--sys/arch/mvme88k/include/m88100.h4
-rw-r--r--sys/arch/mvme88k/include/m88110.h4
-rw-r--r--sys/arch/mvme88k/include/mmu.h4
-rw-r--r--sys/arch/mvme88k/include/mvme188.h4
-rw-r--r--sys/arch/mvme88k/include/mvme1x7.h4
-rw-r--r--sys/arch/mvme88k/include/pcb.h4
-rw-r--r--sys/arch/mvme88k/include/pmap_table.h4
-rw-r--r--sys/arch/mvme88k/include/proc.h6
-rw-r--r--sys/arch/mvme88k/include/profile.h6
-rw-r--r--sys/arch/mvme88k/include/prom.h4
-rw-r--r--sys/arch/mvme88k/include/ptrace.h6
-rw-r--r--sys/arch/mvme88k/include/setjmp.h4
-rw-r--r--sys/arch/mvme88k/include/signal.h4
-rw-r--r--sys/arch/mvme88k/include/trap.h4
-rw-r--r--sys/arch/mvme88k/include/vid.h4
-rw-r--r--sys/arch/mvme88k/include/vmparam.h4
-rw-r--r--sys/arch/mvme88k/mvme88k/eh.S6
-rw-r--r--sys/arch/mvme88k/stand/wrtvid/disklabel.h4
-rw-r--r--sys/arch/mvmeppc/include/prom.h4
-rw-r--r--sys/arch/sun3/dev/kbd.c4
-rw-r--r--sys/arch/vax/include/ioa.h4
-rw-r--r--sys/arch/vax/include/ka650.h4
-rw-r--r--sys/arch/vax/include/pmap.h4
-rw-r--r--sys/arch/vax/include/pte.h4
-rw-r--r--sys/arch/vax/uba/ubavar.h4
-rw-r--r--sys/arch/vax/vax/ka780.c4
49 files changed, 109 insertions, 110 deletions
diff --git a/sys/arch/alpha/alpha/db_instruction.h b/sys/arch/alpha/alpha/db_instruction.h
index 8f88c7790d3..10994cff35c 100644
--- a/sys/arch/alpha/alpha/db_instruction.h
+++ b/sys/arch/alpha/alpha/db_instruction.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_instruction.h,v 1.2 2000/11/08 19:16:58 ericj Exp $ */
+/* $OpenBSD: db_instruction.h,v 1.3 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: db_instruction.h,v 1.6 2000/03/20 02:54:45 thorpej Exp $ */
/*
@@ -197,7 +197,7 @@ typedef union {
} alpha_instruction;
-#endif !defined(ASSEMBLER)
+#endif /* !defined(ASSEMBLER) */
/*
*
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 3234d839dae..082218683b2 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.16 2001/07/25 13:25:31 art Exp $ */
+/* $OpenBSD: pmap.c,v 1.17 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
/*-
@@ -1043,7 +1043,7 @@ pmap_uses_prom_console(void)
|| cputype == ST_DEC_3000_500);
#endif /* NEW_SCC_DRIVER */
}
-#endif _PMAP_MAY_USE_PROM_CONSOLE
+#endif /* _PMAP_MAY_USE_PROM_CONSOLE */
/*
* pmap_steal_memory: [ INTERFACE ]
diff --git a/sys/arch/amiga/amiga/cia.h b/sys/arch/amiga/amiga/cia.h
index dfe64a53454..5873f08e170 100644
--- a/sys/arch/amiga/amiga/cia.h
+++ b/sys/arch/amiga/amiga/cia.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.h,v 1.3 1996/05/06 11:36:52 niklas Exp $ */
+/* $OpenBSD: cia.h,v 1.4 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: cia.h,v 1.9 1996/02/01 22:29:06 mycroft Exp $ */
/*
@@ -143,4 +143,4 @@ void dispatch_cia_ints __P((int, int));
void ciaa_intr __P((void));
void ciab_intr __P((void));
-#endif _AMIGA_CIA_
+#endif /* _AMIGA_CIA_ */
diff --git a/sys/arch/amiga/stand/boot/amigagraph.h b/sys/arch/amiga/stand/boot/amigagraph.h
index 7d3c619b3a0..35257acb51c 100644
--- a/sys/arch/amiga/stand/boot/amigagraph.h
+++ b/sys/arch/amiga/stand/boot/amigagraph.h
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: amigagraph.h,v 1.1 1997/01/16 09:26:24 niklas Exp $
+ * $OpenBSD: amigagraph.h,v 1.2 2001/08/12 12:03:02 heko Exp $
* $NetBSD: amigagraph.h,v 1.1.1.1 1996/11/29 23:36:29 is Exp $
*
* Copyright (c) 1996 Ignatios Souvatzis
@@ -77,4 +77,4 @@
struct Window {
u_int8_t dum1[136];
};
-#endif AMIGA_GRAPH_H
+#endif /* AMIGA_GRAPH_H */
diff --git a/sys/arch/m68k/m68k/db_trace.c b/sys/arch/m68k/m68k/db_trace.c
index 93a16598504..279fb85a33b 100644
--- a/sys/arch/m68k/m68k/db_trace.c
+++ b/sys/arch/m68k/m68k/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.10 2001/05/15 01:43:15 millert Exp $ */
+/* $OpenBSD: db_trace.c,v 1.11 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: db_trace.c,v 1.20 1997/02/05 05:10:25 scottr Exp $ */
/*
@@ -172,7 +172,7 @@ stacktop(regs, sp)
#define BSR 0x61000000 /* bsr x */
#ifdef mc68020
#define BSRL 0x61ff0000 /* bsrl x */
-#endif mc68020
+#endif /* mc68020 */
#define BYTE3 0x0000ff00
#define LOBYTE 0x000000ff
#define ADQMSK 0xf1ff0000
@@ -222,7 +222,7 @@ nextframe(sp, kerneltrace)
addr, sp->k_caller);
#endif
errflg = 0;
-#endif 0
+#endif /* 0 */
} else {
if (addr == MAXINT) {
/* we don't know what registers are involved here--
@@ -308,7 +308,7 @@ findentry(sp)
/* longword self-relative offset */
sp->k_caller = addr - 6;
sp->k_entry = nextword + (addr - 4);
-#endif mc68020
+#endif /* mc68020 */
} else {
instruc = nextword;
if ((instruc & HIWORD) == JSR) {
@@ -368,7 +368,7 @@ findentry(sp)
else
db_printf("Non-tramp jsr a0@\n");
#endif
-#endif 0
+#endif /* 0 */
}
}
}
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index 32acf8f66ed..966df12d89c 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.13 2000/10/18 21:00:36 mickey Exp $ */
+/* $OpenBSD: disksubr.c,v 1.14 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */
/*
@@ -574,7 +574,7 @@ setdisklabel(olp, nlp, openmask, osdep)
nlp->d_checksum = 0;
nlp->d_checksum = dkcksum(nlp);
*olp = *nlp;
-#endif
+#endif /* #if 0 */
return (0);
}
@@ -630,7 +630,7 @@ done:
return (error);
#else
return 0;
-#endif
+#endif /* #if 0 */
}
/*
@@ -664,12 +664,12 @@ bounds_check_with_label(bp, lp, osdep, wlabel)
if (bp->b_blkno + p->p_offset <= LABELSECTOR + labelsect &&
#if LABELSECTOR != 0
bp->b_blkno + p->p_offset + sz > LABELSECTOR + labelsect &&
-#endif
+#endif /* LABELSECTOR != 0 */
(bp->b_flags & B_READ) == 0 && wlabel == 0) {
bp->b_error = EROFS;
goto bad;
}
-#endif
+#endif /* #if 0 */
#if defined(DOSBBSECTOR) && defined(notyet)
/* overwriting master boot record? */
diff --git a/sys/arch/mvme68k/mvme68k/vectors.s b/sys/arch/mvme68k/mvme68k/vectors.s
index cb10381c9d9..bc6607f84f9 100644
--- a/sys/arch/mvme68k/mvme68k/vectors.s
+++ b/sys/arch/mvme68k/mvme68k/vectors.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: vectors.s,v 1.5 2001/06/26 21:35:43 miod Exp $ */
+/* $OpenBSD: vectors.s,v 1.6 2001/08/12 12:03:02 heko Exp $ */
| Copyright (c) 1995 Theo de Raadt
|
@@ -174,4 +174,4 @@ GLOBAL(fpsp_tab)
ASVECTOR(operr) /* 52: FPCP operand error */
ASVECTOR(ovfl) /* 53: FPCP overflow */
ASVECTOR(snan) /* 54: FPCP signalling NAN */
-#endif FPSP
+#endif /* FPSP */
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
diff --git a/sys/arch/mvmeppc/include/prom.h b/sys/arch/mvmeppc/include/prom.h
index 21f76b68d6d..d53fab3b1b5 100644
--- a/sys/arch/mvmeppc/include/prom.h
+++ b/sys/arch/mvmeppc/include/prom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom.h,v 1.1 2001/06/26 21:57:48 smurph Exp $ */
+/* $OpenBSD: prom.h,v 1.2 2001/08/12 12:03:02 heko Exp $ */
/*
* Copyright (c) 2001 Steve Murphree, Jr.
* All rights reserved.
@@ -373,4 +373,4 @@ struct mvmeprom_args {
#ifndef RB_NOSYM
#define RB_NOSYM 0x400
#endif
-#endif __MACHINE_PROM_H__
+#endif /* __MACHINE_PROM_H__ */
diff --git a/sys/arch/sun3/dev/kbd.c b/sys/arch/sun3/dev/kbd.c
index 2cab0c9f067..2f8e405606b 100644
--- a/sys/arch/sun3/dev/kbd.c
+++ b/sys/arch/sun3/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd.c,v 1.7 2001/08/08 22:42:11 miod Exp $ */
+/* $OpenBSD: kbd.c,v 1.8 2001/08/12 12:03:02 heko Exp $ */
/* $NetBSD: kbd.c,v 1.8 1996/05/17 19:32:06 gwr Exp $ */
/*
@@ -440,7 +440,7 @@ kbdioctl(dev, cmd, data, flag, p)
case KIOCGETKEY: /* Get keymap entry (old format) */
error = kbd_oldkeymap(ks, cmd, (struct okiockey *)data);
break;
-#endif KIOCGETKEY */
+#endif /* KIOCGETKEY */
case KIOCSKEY: /* Set keymap entry */
/* Don't let just anyone hose the keyboard. */
diff --git a/sys/arch/vax/include/ioa.h b/sys/arch/vax/include/ioa.h
index 6c3f333c713..e818d109080 100644
--- a/sys/arch/vax/include/ioa.h
+++ b/sys/arch/vax/include/ioa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioa.h,v 1.5 2000/04/26 03:08:41 bjc Exp $ */
+/* $OpenBSD: ioa.h,v 1.6 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: ioa.h,v 1.5 1999/04/12 20:57:52 pk Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -116,4 +116,4 @@ struct ioa {
#define IOA_TYPMSK 0xf0
#define IOA_SBIA 0x10
-#endif VAX8600
+#endif /* VAX8600 */
diff --git a/sys/arch/vax/include/ka650.h b/sys/arch/vax/include/ka650.h
index 84a59ccd90d..6eb4b1587dd 100644
--- a/sys/arch/vax/include/ka650.h
+++ b/sys/arch/vax/include/ka650.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka650.h,v 1.8 2000/04/26 03:08:41 bjc Exp $ */
+/* $OpenBSD: ka650.h,v 1.9 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: ka650.h,v 1.6 1997/07/26 10:12:43 ragge Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -209,7 +209,7 @@ struct ka650_ipcr {
};
#define KA650_IPCR 0x20001e00
-#endif _LOCORE
+#endif /* _LOCORE */
/*
* Physical start address of the Qbus memory.
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index c013ce1a84d..78c3bfac599 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.11 2001/06/15 22:45:33 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.12 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */
/*
@@ -149,4 +149,4 @@ void pmap_activate __P((struct proc *));
#endif /* _KERNEL */
-#endif PMAP_H
+#endif /* PMAP_H */
diff --git a/sys/arch/vax/include/pte.h b/sys/arch/vax/include/pte.h
index 072f83de975..3eaefb468dc 100644
--- a/sys/arch/vax/include/pte.h
+++ b/sys/arch/vax/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.6 2000/04/26 03:08:42 bjc Exp $ */
+/* $OpenBSD: pte.h,v 1.7 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: pte.h,v 1.13 1999/08/03 19:53:23 ragge Exp $ */
/*
@@ -53,7 +53,7 @@ struct pte {
typedef struct pte pt_entry_t; /* Mach page table entry */
-#endif _LOCORE
+#endif /* _LOCORE */
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h
index 24975cd99eb..a6c78d66cb4 100644
--- a/sys/arch/vax/uba/ubavar.h
+++ b/sys/arch/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubavar.h,v 1.8 2000/04/27 03:14:52 bjc Exp $ */
+/* $OpenBSD: ubavar.h,v 1.9 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: ubavar.h,v 1.21 1999/01/19 21:04:48 ragge Exp $ */
/*
@@ -182,4 +182,4 @@ void ubareset __P((int));
int ubasetup __P((struct uba_softc *, struct buf *, int));
#endif /* _KERNEL */
-#endif !_LOCORE
+#endif /* !_LOCORE */
diff --git a/sys/arch/vax/vax/ka780.c b/sys/arch/vax/vax/ka780.c
index c69f6cf62ea..4a933f7e601 100644
--- a/sys/arch/vax/vax/ka780.c
+++ b/sys/arch/vax/vax/ka780.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka780.c,v 1.5 2000/04/27 01:10:12 bjc Exp $ */
+/* $OpenBSD: ka780.c,v 1.6 2001/08/12 12:03:03 heko Exp $ */
/* $NetBSD: ka780.c,v 1.14 1999/08/07 10:36:49 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
@@ -298,7 +298,7 @@ memlog(m, mcr)
printf ("mcr%d: multiple errors, not traceable\n", m);
break;
}
-#endif TRENDATA
+#endif /* TRENDATA */
char *mc780[]={"0","1","2","3","4","5","6","7","8","9","10","11","12","13",
"14","15"};