Module Name: src
Committed By: nat
Date: Tue Feb 27 16:07:02 UTC 2024
Modified Files:
src/sys/arch/evbcf/include: cpu.h
src/sys/arch/m68k/include: cpu.h
src/sys/arch/mac68k/include: cpu.h
Log Message:
Use proper clockframe size for those platforms that require it.
XXX This is a tempory measure, better to fix clock interrupts to take the
common clockframe size.
OK thorpej@.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbcf/include/cpu.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/include/cpu.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mac68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbcf/include/cpu.h
diff -u src/sys/arch/evbcf/include/cpu.h:1.9 src/sys/arch/evbcf/include/cpu.h:1.10
--- src/sys/arch/evbcf/include/cpu.h:1.9 Sat Jan 20 00:15:31 2024
+++ src/sys/arch/evbcf/include/cpu.h Tue Feb 27 16:07:02 2024
@@ -1,3 +1,7 @@
-/* $NetBSD: cpu.h,v 1.9 2024/01/20 00:15:31 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.10 2024/02/27 16:07:02 nat Exp $ */
+
+#ifndef CLOCK_FORMAT0
+#define CLOCK_FORMAT0
+#endif
#include <m68k/cpu.h>
Index: src/sys/arch/m68k/include/cpu.h
diff -u src/sys/arch/m68k/include/cpu.h:1.23 src/sys/arch/m68k/include/cpu.h:1.24
--- src/sys/arch/m68k/include/cpu.h:1.23 Sat Jan 20 02:23:15 2024
+++ src/sys/arch/m68k/include/cpu.h Tue Feb 27 16:07:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.23 2024/01/20 02:23:15 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.24 2024/02/27 16:07:02 nat Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -149,8 +149,10 @@ void cpu_proc_fork(struct proc *, struct
* what the interrupt stub puts on the stack before calling C code.
*/
struct clockframe {
+#ifndef CLOCK_FORMAT0
/* regs saved on the stack by the interrupt stub */
u_int cf_regs[4]; /* d0,d1,a0,a1 */
+#endif
/* hardware frame */
u_short cf_sr; /* sr at time of interrupt */
u_long cf_pc; /* pc at time of interrupt */
Index: src/sys/arch/mac68k/include/cpu.h
diff -u src/sys/arch/mac68k/include/cpu.h:1.105 src/sys/arch/mac68k/include/cpu.h:1.106
--- src/sys/arch/mac68k/include/cpu.h:1.105 Sat Jan 20 00:15:32 2024
+++ src/sys/arch/mac68k/include/cpu.h Tue Feb 27 16:07:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.105 2024/01/20 00:15:32 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.106 2024/02/27 16:07:02 nat Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -60,6 +60,10 @@
#ifndef _CPU_MACHINE_
#define _CPU_MACHINE_
+#ifndef CLOCK_FORMAT0
+#define CLOCK_FORMAT0
+#endif
+
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
#endif
