summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/arm/arm/db_disasm.c4
-rw-r--r--sys/arch/arm/arm/disassem.c4
-rw-r--r--sys/arch/arm/arm/locore.S5
-rw-r--r--sys/arch/arm/arm/setstack.S4
-rw-r--r--sys/arch/arm/arm/stubs.c4
-rw-r--r--sys/arch/arm/arm/sys_machdep.c4
-rw-r--r--sys/arch/arm/arm/vm_machdep.c4
-rw-r--r--sys/arch/arm/include/cpu.h4
-rw-r--r--sys/arch/arm/include/cpufunc.h4
-rw-r--r--sys/arch/arm/include/fp.h4
-rw-r--r--sys/arch/arm/include/frame.h4
-rw-r--r--sys/arch/arm/include/trap.h4
-rw-r--r--sys/arch/arm/include/undefined.h4
-rw-r--r--sys/arch/arm64/conf/GENERIC.MP4
-rw-r--r--sys/arch/arm64/include/frame.h4
15 files changed, 16 insertions, 45 deletions
diff --git a/sys/arch/arm/arm/db_disasm.c b/sys/arch/arm/arm/db_disasm.c
index 071fab0d269..f67bee09c7b 100644
--- a/sys/arch/arm/arm/db_disasm.c
+++ b/sys/arch/arm/arm/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.1 2004/02/01 05:09:48 drahn Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.2 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: db_disasm.c,v 1.4 2003/07/15 00:24:38 lukem Exp $ */
/*
@@ -73,5 +73,3 @@ db_disasm(vaddr_t loc, boolean_t altfmt)
return disasm(&db_disasm_interface, loc, altfmt);
}
-
-/* End of db_disasm.c */
diff --git a/sys/arch/arm/arm/disassem.c b/sys/arch/arm/arm/disassem.c
index 7e31ec2beca..cb12814bd29 100644
--- a/sys/arch/arm/arm/disassem.c
+++ b/sys/arch/arm/arm/disassem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disassem.c,v 1.4 2016/04/25 04:05:55 jsg Exp $ */
+/* $OpenBSD: disassem.c,v 1.5 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $ */
/*
@@ -688,5 +688,3 @@ disassemble(u_int address)
(void)disasm(&disassemble_di, address, 0);
}
-
-/* End of disassem.c */
diff --git a/sys/arch/arm/arm/locore.S b/sys/arch/arm/arm/locore.S
index 09d06193042..1426858df4d 100644
--- a/sys/arch/arm/arm/locore.S
+++ b/sys/arch/arm/arm/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.15 2018/06/04 22:10:58 kettenis Exp $ */
+/* $OpenBSD: locore.S,v 1.16 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */
/*
@@ -168,6 +168,3 @@ _C_LABEL(esym): .word _C_LABEL(end)
ENTRY_NP(abort)
b _C_LABEL(abort)
-
-
-/* End of locore.S */
diff --git a/sys/arch/arm/arm/setstack.S b/sys/arch/arm/arm/setstack.S
index bc6f92b862f..a155483575f 100644
--- a/sys/arch/arm/arm/setstack.S
+++ b/sys/arch/arm/arm/setstack.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: setstack.S,v 1.3 2015/01/18 14:55:02 jsg Exp $ */
+/* $OpenBSD: setstack.S,v 1.4 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: setstack.S,v 1.2 2002/08/15 01:37:02 briggs Exp $ */
/*
@@ -89,5 +89,3 @@ ENTRY(get_stackptr)
msr cpsr_c, r3 /* Restore the old mode */
mov pc, lr /* Exit */
-
-/* End of setstack.S */
diff --git a/sys/arch/arm/arm/stubs.c b/sys/arch/arm/arm/stubs.c
index 7a99ef06bba..ea3e2114df3 100644
--- a/sys/arch/arm/arm/stubs.c
+++ b/sys/arch/arm/arm/stubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stubs.c,v 1.10 2015/10/21 07:59:17 mpi Exp $ */
+/* $OpenBSD: stubs.c,v 1.11 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: stubs.c,v 1.14 2003/07/15 00:24:42 lukem Exp $ */
/*
@@ -233,5 +233,3 @@ abort:
printf("\n\n");
delay(1000000);
}
-
-/* End of stubs.c */
diff --git a/sys/arch/arm/arm/sys_machdep.c b/sys/arch/arm/arm/sys_machdep.c
index bdb1c54dddd..aff17ff634f 100644
--- a/sys/arch/arm/arm/sys_machdep.c
+++ b/sys/arch/arm/arm/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.4 2017/03/21 21:43:11 kettenis Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.5 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: sys_machdep.c,v 1.6 2003/07/15 00:24:42 lukem Exp $ */
/*
@@ -149,5 +149,3 @@ sys_sysarch(p, v, retval)
}
return (error);
}
-
-/* End of sys_machdep.c */
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 628a538c434..a3add64171e 100644
--- a/sys/arch/arm/arm/vm_machdep.c
+++ b/sys/arch/arm/arm/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.23 2018/03/16 21:46:04 kettenis Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.24 2018/06/30 15:23:35 deraadt Exp $ */
/* $NetBSD: vm_machdep.c,v 1.31 2004/01/04 11:33:29 jdolecek Exp $ */
/*
@@ -205,5 +205,3 @@ vunmapbuf(struct buf *bp, vsize_t len)
bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = 0;
}
-
-/* End of vm_machdep.c */
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 9fd273e6dcf..3dd159101df 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.50 2018/01/26 16:22:20 kettenis Exp $ */
+/* $OpenBSD: cpu.h,v 1.51 2018/06/30 15:23:36 deraadt Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -311,5 +311,3 @@ void board_startup(void);
#endif /* _KERNEL */
#endif /* !_ARM_CPU_H_ */
-
-/* End of cpu.h */
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index b58e2487dfb..d788b50d525 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.h,v 1.30 2018/01/15 14:11:16 kettenis Exp $ */
+/* $OpenBSD: cpufunc.h,v 1.31 2018/06/30 15:23:36 deraadt Exp $ */
/* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */
/*
@@ -343,5 +343,3 @@ extern int arm_dcache_align_mask;
#endif /* _KERNEL */
#endif /* _ARM_CPUFUNC_H_ */
-
-/* End of cpufunc.h */
diff --git a/sys/arch/arm/include/fp.h b/sys/arch/arm/include/fp.h
index d503ea1167f..7917501cb16 100644
--- a/sys/arch/arm/include/fp.h
+++ b/sys/arch/arm/include/fp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fp.h,v 1.2 2018/01/26 16:22:20 kettenis Exp $ */
+/* $OpenBSD: fp.h,v 1.3 2018/06/30 15:23:37 deraadt Exp $ */
/* $NetBSD: fp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $ */
/*
@@ -70,5 +70,3 @@ typedef struct {
} fp_state_t;
#endif
-
-/* End of fp.h */
diff --git a/sys/arch/arm/include/frame.h b/sys/arch/arm/include/frame.h
index 97382ef521c..4645031b40d 100644
--- a/sys/arch/arm/include/frame.h
+++ b/sys/arch/arm/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.12 2017/01/06 00:06:02 jsg Exp $ */
+/* $OpenBSD: frame.h,v 1.13 2018/06/30 15:23:37 deraadt Exp $ */
/* $NetBSD: frame.h,v 1.9 2003/12/01 08:48:33 scw Exp $ */
/*
@@ -295,5 +295,3 @@ struct frame {
#endif /* _LOCORE */
#endif /* _ARM_FRAME_H_ */
-
-/* End of frame.h */
diff --git a/sys/arch/arm/include/trap.h b/sys/arch/arm/include/trap.h
index d6346a42ef4..64a83f7068e 100644
--- a/sys/arch/arm/include/trap.h
+++ b/sys/arch/arm/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: trap.h,v 1.2 2018/06/30 15:23:37 deraadt Exp $ */
/* $NetBSD: trap.h,v 1.4 2003/04/28 01:54:50 briggs Exp $ */
/*
@@ -67,5 +67,3 @@
#define USER_BREAKPOINT GDB_BREAKPOINT
#define T_FAULT 1
-
-/* End of trap.h */
diff --git a/sys/arch/arm/include/undefined.h b/sys/arch/arm/include/undefined.h
index e3c38ca7e2e..b84670d2d6f 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: undefined.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
+/* $OpenBSD: undefined.h,v 1.3 2018/06/30 15:23:37 deraadt Exp $ */
/* $NetBSD: undefined.h,v 1.4 2001/12/20 01:20:23 thorpej Exp $ */
/*
@@ -84,6 +84,4 @@ void undefinedinstruction(struct trapframe *);
#endif
-/* End of undefined.h */
-
#endif /* _ARM_UNDEFINED_H_ */
diff --git a/sys/arch/arm64/conf/GENERIC.MP b/sys/arch/arm64/conf/GENERIC.MP
index bdeb22dc496..0876a4ab846 100644
--- a/sys/arch/arm64/conf/GENERIC.MP
+++ b/sys/arch/arm64/conf/GENERIC.MP
@@ -1,9 +1,9 @@
-# $OpenBSD: GENERIC.MP,v 1.2 2018/06/01 14:16:25 visa Exp $
+# $OpenBSD: GENERIC.MP,v 1.3 2018/06/30 15:23:37 deraadt Exp $
include "arch/arm64/conf/GENERIC"
option MULTIPROCESSOR
#option MP_LOCKDEBUG
-option WITNESS
+#option WITNESS
cpu* at mainbus?
diff --git a/sys/arch/arm64/include/frame.h b/sys/arch/arm64/include/frame.h
index 72fe913b1d3..0a69dd34039 100644
--- a/sys/arch/arm64/include/frame.h
+++ b/sys/arch/arm64/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.2 2018/05/04 15:43:34 visa Exp $ */
+/* $OpenBSD: frame.h,v 1.3 2018/06/30 15:23:37 deraadt Exp $ */
/*
* Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
*
@@ -75,5 +75,3 @@ struct callframe {
#endif /* !_LOCORE */
#endif /* _MACHINE_FRAME_H_ */
-
-/* End of frame.h */