From 8703076975cf79885594da103748ff116b4bfcfe Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Fri, 5 May 1995 03:41:51 +0000
Subject: [PATCH] define BROKEN_SWAP and/or cpu_swapout as appropriate.

---
 sys/arch/alpha/include/cpu.h  |  4 +++-
 sys/arch/amiga/include/cpu.h  |  4 +++-
 sys/arch/atari/include/cpu.h  |  4 +++-
 sys/arch/da30/include/cpu.h   |  4 +++-
 sys/arch/hp300/include/cpu.h  |  4 +++-
 sys/arch/i386/include/cpu.h   |  4 +++-
 sys/arch/mac68k/include/cpu.h |  4 +++-
 sys/arch/mips/include/cpu.h   |  8 +++++---
 sys/arch/pc532/include/cpu.h  | 12 ++++++------
 sys/arch/pmax/include/cpu.h   |  8 +++++---
 sys/arch/sparc/include/cpu.h  |  4 +++-
 sys/arch/sun3/include/cpu.h   |  4 +++-
 sys/arch/vax/include/cpu.h    |  4 +++-
 13 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index febc710ae64b..ea9437666299 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.3 1995/04/22 20:24:49 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.4 1995/05/05 03:41:51 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -58,6 +58,8 @@
 #define	cpu_exec(p)			/* nothing XXX? */
 #define	cpu_wait(p)			/* nothing */
 #define	cpu_setstack(p, ap)		(p)->p_addr->u_pcb.pcb_usp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/amiga/include/cpu.h b/sys/arch/amiga/include/cpu.h
index 6224dd9618aa..c768bf1cd27e 100644
--- a/sys/arch/amiga/include/cpu.h
+++ b/sys/arch/amiga/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.18 1995/04/22 20:25:09 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.19 1995/05/05 03:41:54 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -57,6 +57,8 @@
 #define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/atari/include/cpu.h b/sys/arch/atari/include/cpu.h
index 05beb31a49e6..797d0ae31d92 100644
--- a/sys/arch/atari/include/cpu.h
+++ b/sys/arch/atari/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.4 1995/04/30 11:56:22 leo Exp $	*/
+/*	$NetBSD: cpu.h,v 1.5 1995/05/05 03:41:56 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -58,6 +58,8 @@
 #define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/da30/include/cpu.h b/sys/arch/da30/include/cpu.h
index 9a8b083457dd..64f116a082ec 100644
--- a/sys/arch/da30/include/cpu.h
+++ b/sys/arch/da30/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.5 1995/04/22 20:25:34 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.6 1995/05/05 03:41:58 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -55,6 +55,8 @@
 #define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index 363d045e2807..d6b8528294f6 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.11 1995/04/22 20:26:06 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.12 1995/05/05 03:41:59 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -55,6 +55,8 @@
 #define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 141b81189715..f7aafab9a256 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.27 1995/04/22 20:26:58 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.28 1995/05/05 03:42:02 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -56,6 +56,8 @@
 #define	cpu_swapin(p)		/* nothing */
 #define	cpu_wait(p)		/* nothing */
 #define	cpu_set_init_frame(p,frame)	(p->p_md.md_regs = frame)
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)		panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock, softclock and statclock
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 7d44747dc587..2387b68a1e85 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.19 1995/04/22 20:27:25 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.20 1995/05/05 03:42:06 cgd Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -81,6 +81,8 @@
 #define	cpu_wait(p)			/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock, softclock and gatherstats
diff --git a/sys/arch/mips/include/cpu.h b/sys/arch/mips/include/cpu.h
index ac581f08f0cf..7c7d4042d1b4 100644
--- a/sys/arch/mips/include/cpu.h
+++ b/sys/arch/mips/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.10 1995/04/22 20:27:59 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.11 1995/05/05 03:42:09 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -52,8 +52,10 @@
  * referenced in generic code
  */
 #define	cpu_exec(p)		(p->p_md.md_ss_addr = 0) /* init single step */
-#define	cpu_wait(p)		/* nothing */
-#define cpu_set_init_frame(p, fp) /* nothing */
+#define	cpu_wait(p)			/* nothing */
+#define cpu_set_init_frame(p, fp)	/* nothing */
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/pc532/include/cpu.h b/sys/arch/pc532/include/cpu.h
index dfe229a89d10..317c7b680b2f 100644
--- a/sys/arch/pc532/include/cpu.h
+++ b/sys/arch/pc532/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.9 1995/04/22 20:27:51 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.10 1995/05/05 03:42:07 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -53,8 +53,11 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_exec(p)		/* nothing */
-#define cpu_swapin(p)           /* nothing */
+#define	cpu_exec(p)			/* nothing */
+#define cpu_swapin(p)           	/* nothing */
+#define cpu_set_init_frame(p,fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*  XXX needed?  PAN
  * function vs. inline configuration;
@@ -115,7 +118,4 @@ int	want_resched;	/* resched() was called */
 	{ "console_device", CTLTYPE_STRUCT }, \
 }
 
-/* Support for init start up. */
-#define cpu_set_init_frame(p,fp) (p)->p_md.md_regs = fp
-
 #endif
diff --git a/sys/arch/pmax/include/cpu.h b/sys/arch/pmax/include/cpu.h
index ac581f08f0cf..7c7d4042d1b4 100644
--- a/sys/arch/pmax/include/cpu.h
+++ b/sys/arch/pmax/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.10 1995/04/22 20:27:59 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.11 1995/05/05 03:42:09 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -52,8 +52,10 @@
  * referenced in generic code
  */
 #define	cpu_exec(p)		(p->p_md.md_ss_addr = 0) /* init single step */
-#define	cpu_wait(p)		/* nothing */
-#define cpu_set_init_frame(p, fp) /* nothing */
+#define	cpu_wait(p)			/* nothing */
+#define cpu_set_init_frame(p, fp)	/* nothing */
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 82be61408e9c..91b128af1783 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.13 1995/04/22 20:28:23 christos Exp $ */
+/*	$NetBSD: cpu.h,v 1.14 1995/05/05 03:42:11 cgd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -71,6 +71,8 @@
 #define	cpu_exec(p)	/* nothing */
 #define	cpu_swapin(p)	/* nothing */
 #define	cpu_wait(p)	/* nothing */
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * See syscall() for an explanation of the following.  Note that the
diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index 5de41e22b5be..305ba65d3cd9 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.16 1995/04/22 20:28:53 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.17 1995/05/05 03:42:13 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -58,6 +58,8 @@
 #define	cpu_wait(p) 	/* nothing */
 #define cpu_setstack(p, ap)		(p)->p_md.md_regs[SP] = ap
 #define cpu_set_init_frame(p, fp)	(p)->p_md.md_regs = fp
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index 7d245e89f73e..a33eb4069580 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.8 1995/05/03 19:53:42 ragge Exp $      */
+/*      $NetBSD: cpu.h,v 1.9 1995/05/05 03:42:15 cgd Exp $      */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -41,6 +41,8 @@
 #define cpu_set_init_frame(p,f)\
 	 {extern u_int scratch;p->p_addr->u_pcb.framep=scratch;}
 #define	cpu_wait(p)
+#define	BROKEN_SWAP
+#define	cpu_swapout(p)			panic("cpu_swapout: can't get here");
 
 
 extern volatile int cpunumber;