diff --git a/sys/arch/amiga/amiga/genassym.cf b/sys/arch/amiga/amiga/genassym.cf
index da0c0624498c..7366ed40a65a 100644
--- a/sys/arch/amiga/amiga/genassym.cf
+++ b/sys/arch/amiga/amiga/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.23 2007/05/18 01:39:52 mhitch Exp $
+#	$NetBSD: genassym.cf,v 1.24 2007/05/22 20:29:32 mhitch Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -168,7 +168,6 @@ define	PCB_FLAGS	offsetof(struct pcb, pcb_flags)
 define	PCB_PS		offsetof(struct pcb, pcb_ps)
 define	PCB_USP		offsetof(struct pcb, pcb_usp)
 define	PCB_REGS	offsetof(struct pcb, pcb_regs)
-define	PCB_CMAP2	offsetof(struct pcb, pcb_cmap2)
 define	PCB_ONFAULT	offsetof(struct pcb, pcb_onfault)
 define	PCB_FPCTX	offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB	sizeof(struct pcb)
diff --git a/sys/arch/amiga/include/pcb.h b/sys/arch/amiga/include/pcb.h
index 039e44df680e..1a5d8b814f5e 100644
--- a/sys/arch/amiga/include/pcb.h
+++ b/sys/arch/amiga/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcb.h,v 1.14 2007/03/04 05:59:30 christos Exp $	*/
+/*	$NetBSD: pcb.h,v 1.15 2007/05/22 20:29:31 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -90,7 +90,6 @@ struct pcb
 	int	__pcb_spare0;
 	int	pcb_usp;	/* user stack pointer (+8) */
 	int	pcb_regs[12];	/* D2-D7, A2-A7 (+C) */
-	int	pcb_cmap2;	/* temporary copy PTE */
 	void *	pcb_onfault;	/* for copyin/out faults */
 	struct	fpframe pcb_fpregs; /* 68881/2 context save area */
 	int	pcb_exec[16];	/* exec structure for core dumps */
diff --git a/sys/arch/m68k/m68k/switch_subr.s b/sys/arch/m68k/m68k/switch_subr.s
index d1e38ea7f4f0..13095c4d26ea 100644
--- a/sys/arch/m68k/m68k/switch_subr.s
+++ b/sys/arch/m68k/m68k/switch_subr.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: switch_subr.s,v 1.18 2007/05/21 14:01:56 tsutsui Exp $	*/
+/*	$NetBSD: switch_subr.s,v 1.19 2007/05/22 20:29:32 mhitch Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation.
@@ -141,10 +141,6 @@ ENTRY(cpu_switchto)
 	movl	%usp,%a2		| grab USP (a2 has been saved)
 	movl	%a2,%a1@(PCB_USP)	| and save it
 
-#ifdef PCB_CMAP2
-	movl	_C_LABEL(CMAP2),%a1@(PCB_CMAP2)	| XXX: For Amiga
-#endif
-
 #ifdef _M68K_CUSTOM_FPU_CTX
 	jbsr	_ASM_LABEL(m68k_fpuctx_save)
 #else
@@ -249,10 +245,6 @@ Lsame_mmuctx:
 	movl	%sp@(4),%d1		| restore oldlwp for a return value
 	lea     _ASM_LABEL(tmpstk),%sp	| now goto a tmp stack for NMI
 
-#ifdef PCB_CMAP2
-	movl	%a1@(PCB_CMAP2),_C_LABEL(CMAP2)	| XXX: For Amiga
-#endif
-
 	moveml	%a1@(PCB_REGS),%d2-%d7/%a2-%a7	| and registers
 	movl	%a1@(PCB_USP),%a0
 	movl	%a0,%usp		| and USP