Remove cpu_swapin() and cpu_swapout(), they are no longer necessary (except

for cpu_swapin() on hppa* which is kept).

21 files changed, 27 insertions, 244 deletions

diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index 88b08b62e77..6c28027bbc7 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.31 2006/04/13 14:41:08 brad Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.32 2006/11/29 12:26:11 miod Exp $ */
 /* $NetBSD: vm_machdep.c,v 1.55 2000/03/29 03:49:48 simonb Exp $ */
 
 /*
@@ -234,39 +234,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 		up->u_pcb.pcb_context[8] = ALPHA_PSL_IPL_0; /* ps: IPL */
 	}
 }
-/*
- * Finish a swapin operation.
- * We needed to update the cached PTEs for the user area in the
- * machine dependent part of the proc structure.
- */
-void
-cpu_swapin(p)
-	register struct proc *p;
-{
-	struct user *up = p->p_addr;
-
-	/*
-	 * Cache the physical address of the pcb, so we can swap to
-	 * it easily.
-	 */
-	p->p_md.md_pcbpaddr = (void *)vtophys((vaddr_t)&up->u_pcb);
-}
-
-/*
- * cpu_swapout is called immediately before a process's 'struct user'
- * and kernel stack are unwired, and after the process' P_INMEM flag
- * is cleared).  If the process is the current owner of the floating
- * point unit, the FP state has to be saved, so that it goes out with
- * the pcb, which is in the user area.
- */
-void
-cpu_swapout(p)
-	struct proc *p;
-{
-
-	if (p->p_addr->u_pcb.pcb_fpcpu != NULL)
-		fpusave_proc(p, 1);
-}
 
 /*
  * Move pages from one kernel virtual address to another.
diff --git a/sys/arch/amd64/amd64/vm_machdep.c b/sys/arch/amd64/amd64/vm_machdep.c
index 9f5e0b4c19f..34932f46dbf 100644
--- a/sys/arch/amd64/amd64/vm_machdep.c
+++ b/sys/arch/amd64/amd64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.7 2006/06/23 13:46:05 mickey Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.8 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 2003/04/26 18:39:33 fvdl Exp $	*/
 
 /*-
@@ -151,22 +151,6 @@ cpu_fork(struct proc *p1, struct proc *p2, void *stack, size_t stacksize,
 	pcb->pcb_rbp = 0;
 }
 
-void
-cpu_swapin(struct proc *p)
-{
-	setredzone(p);
-}
-
-void
-cpu_swapout(struct proc *p)
-{
-
-	/*
-	 * Make sure we save the FP state before the user area vanishes.
-	 */
-	fpusave_proc(p, 1);
-}
-
 /*
  * cpu_exit is called as the last action during exit.
  *
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 14cd15864da..d7713ff83c4 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.4 2005/05/23 23:26:55 tedu Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.5 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.31 2004/01/04 11:33:29 jdolecek Exp $	*/
 
 /*
@@ -224,56 +224,6 @@ cpu_exit(struct proc *p)
 	switch_exit(p, &proc0, exit2);
 }
 
-void
-cpu_swapin(p)
-	struct proc *p;
-{
-#if 0
-
-	/* Don't do this.  See the comment in cpu_swapout().  */
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("cpu_swapin(%p, %d, %s, %p)\n", l, l->l_lid,
-		    p->p_comm, p->p_vmspace->vm_map.pmap);
-#endif	/* PMAP_DEBUG */
-
-	if (vector_page < KERNEL_BASE) {
-		/* Map the vector page */
-		pmap_enter(p->p_vmspace->vm_map.pmap, vector_page,
-		    systempage.pv_pa, VM_PROT_READ, VM_PROT_READ|PMAP_WIRED);
-		pmap_update(p->p_vmspace->vm_map.pmap);
-	}
-#endif
-}
-
-
-void
-cpu_swapout(l)
-	struct proc *l;
-{
-#if 0
-	struct proc *p = l->l_proc;
-
-	/* 
-	 * Don't do this!  If the pmap is shared with another process,
-	 * it will lose its page0 entry.  That's bad news indeed.
-	 */
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("cpu_swapout(%p, %d, %s, %p)\n", l, l->l_lid,
-		    p->p_comm, &p->p_vmspace->vm_map.pmap);
-#endif	/* PMAP_DEBUG */
-
-	if (vector_page < KERNEL_BASE) {
-		/* Free the system page mapping */
-		pmap_remove(p->p_vmspace->vm_map.pmap, vector_page,
-		    vector_page + PAGE_SIZE);
-		pmap_update(p->p_vmspace->vm_map.pmap);
-	}
-#endif
-}
-
-
 /*
  * Move pages from one kernel virtual address to another.
  * Both addresses are assumed to reside in the Sysmap,
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index 0d9d1f30b10..df051c819cc 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.31 2006/06/24 13:20:19 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.32 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $	*/
 
 /*
@@ -60,9 +60,7 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_swapin(p)			/* nothing */
 #define	cpu_wait(p)			/* nothing */
-#define	cpu_swapout(p)			/* nothing */
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c
index 4ce15d36b57..56e4b3f2fde 100644
--- a/sys/arch/hppa/hppa/vm_machdep.c
+++ b/sys/arch/hppa/hppa/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.56 2005/03/15 05:13:32 mickey Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.57 2006/11/29 12:26:13 miod Exp $	*/
 
 /*
  * Copyright (c) 1999-2004 Michael Shalayeff
@@ -113,9 +113,10 @@ pagemove(from, to, size)
 	pmap_update(pmap_kernel());
 }
 
+void cpu_swapin(struct proc *p);
+
 void
-cpu_swapin(p)
-	struct proc *p;
+cpu_swapin(struct proc *p)
 {
 	struct trapframe *tf = p->p_md.md_regs;
 	paddr_t pa;
@@ -130,22 +131,6 @@ cpu_swapin(p)
 }
 
 void
-cpu_swapout(p)
-	struct proc *p;
-{
-	extern paddr_t fpu_curpcb;	/* from locore.S */
-	extern u_int fpu_enable;
-	struct trapframe *tf = p->p_md.md_regs;
-
-	if (tf->tf_cr30 == fpu_curpcb) {
-		mtctl(fpu_enable, CR_CCR);
-		fpu_save(fpu_curpcb);
-		fpu_curpcb = 0;
-		mtctl(0, CR_CCR);
-	}
-}
-
-void
 cpu_fork(p1, p2, stack, stacksize, func, arg)
 	struct proc *p1, *p2;
 	void *stack;
diff --git a/sys/arch/hppa64/hppa64/vm_machdep.c b/sys/arch/hppa64/hppa64/vm_machdep.c
index 5dffbd59b40..5cae3d3f2a2 100644
--- a/sys/arch/hppa64/hppa64/vm_machdep.c
+++ b/sys/arch/hppa64/hppa64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.2 2005/05/01 19:29:56 mickey Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.3 2006/11/29 12:26:13 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -104,9 +104,10 @@ pagemove(from, to, size)
 	pmap_update(pmap_kernel());
 }
 
+void cpu_swapin(struct proc *p);
+
 void
-cpu_swapin(p)
-	struct proc *p;
+cpu_swapin(struct proc *p)
 {
 	struct trapframe *tf = p->p_md.md_regs;
 	paddr_t pa;
@@ -121,22 +122,6 @@ cpu_swapin(p)
 }
 
 void
-cpu_swapout(p)
-	struct proc *p;
-{
-	extern paddr_t fpu_curpcb;	/* from locore.S */
-	extern u_int fpu_enable;
-	struct trapframe *tf = p->p_md.md_regs;
-
-	if (tf->tf_cr30 == fpu_curpcb) {
-		mtctl(fpu_enable, CR_CCR);
-		fpu_save(fpu_curpcb);
-		fpu_curpcb = 0;
-		mtctl(0, CR_CCR);
-	}
-}
-
-void
 cpu_fork(p1, p2, stack, stacksize, func, arg)
 	struct proc *p1, *p2;
 	void *stack;
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 480ab5a8bfc..c62f3682c9d 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.46 2006/09/19 11:06:33 jsg Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.47 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $	*/
 
 /*-
@@ -133,18 +133,6 @@ cpu_fork(struct proc *p1, struct proc *p2, void *stack, size_t stacksize,
 	pcb->pcb_esp = (int)sf;
 }
 
-void
-cpu_swapout(struct proc *p)
-{
-
-#if NNPX > 0
-	/*
-	 * Make sure we save the FP state before the user area vanishes.
-	 */
-	npxsave_proc(p, 1);
-#endif
-}
-
 /*
  * cpu_exit is called as the last action during exit.
  *
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 757f2566b9a..e1954531041 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.81 2006/11/26 15:13:21 dim Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.82 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -56,12 +56,6 @@
 #endif
 
 /*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define	cpu_swapin(p)			/* nothing */
-
-/*
  * Arguments to hardclock, softclock and statclock
  * encapsulate the previous machine state in an opaque
  * clockframe; for now, use generic intrframe.
@@ -203,12 +197,6 @@ extern void cpu_init_idle_pcbs(void);
 
 #define CPU_IS_PRIMARY(ci)	1
 
-/*
- * definitions of cpu-dependent requirements
- * referenced in generic code
- */
-#define	cpu_swapin(p)			/* nothing */
-
 #endif
 
 #define curpcb			curcpu()->ci_curpcb
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index 128b22d42d4..da423c0d2dd 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.15 2006/05/08 14:36:09 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.16 2006/11/29 12:26:13 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -152,8 +152,6 @@ void	set_cpu_number(cpuid_t);
  */
 #define	cpu_exec(p)		do { /* nothing */ } while (0)
 #define	cpu_wait(p)		do { /* nothing */ } while (0)
-#define	cpu_swapin(p)		do { /* nothing */ } while (0)
-#define	cpu_swapout(p)		do { /* nothing */ } while (0)
 
 #if defined(MULTIPROCESSOR)
 #include <sys/lock.h>
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index e207e898011..b97efff30d5 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.41 2006/09/22 22:15:17 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.42 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $	*/
 
 /*
@@ -80,9 +80,7 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_swapin(p)			/* nothing */
 #define	cpu_wait(p)			/* nothing */
-#define	cpu_swapout(p)			/* nothing */
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 41e951eeb6e..30a30fa6899 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.12 2006/01/02 18:09:25 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.13 2006/11/29 12:26:13 miod Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -319,7 +319,6 @@
 #define	COPY_SIGCODE		/* copy sigcode above user stack in exec */
 
 #define	cpu_wait(p)		/* nothing */
-#define cpu_swapout(p)		panic("cpu_swapout: can't get here");
 
 #ifndef _LOCORE
 #include <machine/frame.h>
diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c
index 283aaba9b31..064de806864 100644
--- a/sys/arch/mips64/mips64/vm_machdep.c
+++ b/sys/arch/mips64/mips64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.7 2005/01/31 21:35:50 grange Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.8 2006/11/29 12:26:13 miod Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -105,15 +105,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 }
 
 /*
- * Finish a swapin operation. Nothing to do.
- */
-void
-cpu_swapin(p)
-	struct proc *p;
-{
-}
-
-/*
  * cpu_exit is called as the last action during exit.
  * release adress space and machine dependent resources.
  */
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 201ce6c7e5c..11e0a01ed04 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.24 2006/06/24 14:04:02 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.25 2006/11/29 12:26:13 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -85,9 +85,7 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_swapin(p)			/* nothing */
 #define	cpu_wait(p)			/* nothing */
-#define cpu_swapout(p)			/* nothing */
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index 154361f1f49..d6c4026e087 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.27 2006/02/10 21:27:22 kettenis Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.28 2006/11/29 12:26:13 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $	*/
 
 /*
@@ -42,7 +42,6 @@
 #define	CLKF_PC(frame)		((frame)->srr0)
 #define	CLKF_INTR(frame)	((frame)->depth != 0)
 
-#define	cpu_swapout(p)
 #define	cpu_wait(p)
 
 void	delay(unsigned);
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index 4cf2a8cdaf1..d21d46bd283 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.40 2005/12/17 07:31:27 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.41 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -125,15 +125,6 @@ cpu_fork(struct proc *p1, struct proc *p2, void *stack, size_t stacksize,
 	pcb->pcb_spl = 0;
 }
 
-void
-cpu_swapin(struct proc *p)
-{
-	struct pcb *pcb = &p->p_addr->u_pcb;
-	
-	pmap_extract(pmap_kernel(),
-	    (vaddr_t)pcb->pcb_pm, (paddr_t *)&pcb->pcb_pmreal);
-}
-
 /*
  * Move pages from one kernel virtual address to another.
  */
diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h
index 0e9d6b38f5c..b7d09e095c7 100644
--- a/sys/arch/sh/include/cpu.h
+++ b/sys/arch/sh/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.2 2006/10/06 22:30:26 mickey Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.3 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $	*/
 
 /*-
@@ -51,13 +51,6 @@
 #ifdef _KERNEL
 
 /*
- * Can't swapout u-area, (__SWAP_BROKEN)
- * since we use P1 converted address for trapframe.
- */
-#define	cpu_swapin(p)			/* nothing */
-#define	cpu_swapout(p)			/* nothing */
-
-/*
  * Arguments to hardclock and gatherstats encapsulate the previous
  * machine state in an opaque clockframe.
  */
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 6fa40683229..2f157be7e14 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.25 2005/08/14 10:58:36 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.26 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -74,8 +74,6 @@
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_swapin(p)	/* nothing */
-#define	cpu_swapout(p)	/* nothing */
 #define cpu_wait(p)	/* nothing */
 
 /*
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 5012b20c971..f657a981b2a 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.35 2006/06/21 21:53:32 jason Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.36 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -128,8 +128,6 @@ extern struct cpu_info cpu_info_store;
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
-#define	cpu_swapin(p)	/* nothing */
-#define	cpu_swapout(p)	/* nothing */
 #define	cpu_wait(p)	/* nothing */
 #if 1
 #define cpu_number()	0
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index 28355727005..a798fb98972 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cpu.h,v 1.20 2006/07/20 19:15:34 miod Exp $      */
+/*      $OpenBSD: cpu.h,v 1.21 2006/11/29 12:26:14 miod Exp $      */
 /*      $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $      */
 
 /*
@@ -46,7 +46,6 @@
 #include <machine/psl.h>
 
 #define	cpu_wait(p)
-#define	cpu_swapout(p)
 #define	cpu_number()			0
 
 /*
@@ -120,7 +119,6 @@ extern char cpu_model[100];
 
 /* Some low-level prototypes */
 int	badaddr(caddr_t, int);
-void	cpu_swapin(struct proc *);
 void	dumpconf(void);
 void	dumpsys(void);
 void	swapconf(void);
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index efa547505d3..d6e1ac404f1 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.31 2006/07/24 17:26:29 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.32 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.67 2000/06/29 07:14:34 mrg Exp $	     */
 
 /*
@@ -248,23 +248,6 @@ cpu_coredump(p, vp, cred, chdr)
 }
 
 /*
- * Kernel stack red zone need to be set when a process is swapped in.
- * Be sure that all pages are valid.
- */
-void
-cpu_swapin(p)
-	struct proc *p;
-{
-	pt_entry_t *pte;
-	int i;
-
-	pte = kvtopte((vaddr_t)p->p_addr);
-	for (i = 0; i < (USPACE/VAX_NBPG); i ++)
-		pte[i] |= PG_V;
-	*kvtopte((vaddr_t)p->p_addr + REDZONEADDR) &= ~PG_V;
-}
-
-/*
  * Map in a bunch of pages read/writeable for the kernel.
  */
 void
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index 299ae7a8176..79ca6fa7745 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.61 2006/11/29 12:24:18 miod Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.62 2006/11/29 12:26:14 miod Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $	*/
 
 /*
@@ -449,12 +449,6 @@ struct core;
 void		vmapbuf(struct buf *, vsize_t);
 void		vunmapbuf(struct buf *, vsize_t);
 void		pagemove(caddr_t, caddr_t, size_t);
-#ifndef	cpu_swapin
-void		cpu_swapin(struct proc *);
-#endif
-#ifndef	cpu_swapout
-void		cpu_swapout(struct proc *);
-#endif
 void		cpu_fork(struct proc *, struct proc *, void *, size_t,
 		    void (*)(void *), void *);