diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm/arm32/arm32_machdep.c
similarity index 99%
rename from sys/arch/arm32/arm32/machdep.c
rename to sys/arch/arm/arm32/arm32_machdep.c
index cadfdaf31ddb..18d861a337ef 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm/arm32/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.98 2001/06/11 11:56:58 rearnsha Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/bus_dma.c b/sys/arch/arm/arm32/bus_dma.c
similarity index 99%
rename from sys/arch/arm32/arm32/bus_dma.c
rename to sys/arch/arm/arm32/bus_dma.c
index 07f6a48ccfde..fc4a7091671a 100644
--- a/sys/arch/arm32/arm32/bus_dma.c
+++ b/sys/arch/arm/arm32/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.25 2001/07/28 11:17:15 chris Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/arch/arm32/arm32/cpuswitch.S b/sys/arch/arm/arm32/cpuswitch.S
similarity index 99%
rename from sys/arch/arm32/arm32/cpuswitch.S
rename to sys/arch/arm/arm32/cpuswitch.S
index 12730045431f..5e9a0921c36d 100644
--- a/sys/arch/arm32/arm32/cpuswitch.S
+++ b/sys/arch/arm/arm32/cpuswitch.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuswitch.S,v 1.35 2001/05/23 21:49:57 chris Exp $	*/
+/*	$NetBSD: cpuswitch.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/exception.S b/sys/arch/arm/arm32/exception.S
similarity index 99%
rename from sys/arch/arm32/arm32/exception.S
rename to sys/arch/arm/arm32/exception.S
index 84e7912921da..2fae5e48c7d3 100644
--- a/sys/arch/arm32/arm32/exception.S
+++ b/sys/arch/arm/arm32/exception.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: exception.S,v 1.14 2000/03/24 17:05:30 ws Exp $	*/
+/*	$NetBSD: exception.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/fault.c b/sys/arch/arm/arm32/fault.c
similarity index 99%
rename from sys/arch/arm32/arm32/fault.c
rename to sys/arch/arm/arm32/fault.c
index 90389b4eb1d3..fbe83a6a75da 100644
--- a/sys/arch/arm32/arm32/fault.c
+++ b/sys/arch/arm/arm32/fault.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fault.c,v 1.57 2001/07/19 16:13:00 wiz Exp $	*/
+/*	$NetBSD: fault.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/fusu.S b/sys/arch/arm/arm32/fusu.S
similarity index 99%
rename from sys/arch/arm32/arm32/fusu.S
rename to sys/arch/arm/arm32/fusu.S
index 395f7d55136d..d46453ecabf9 100644
--- a/sys/arch/arm32/arm32/fusu.S
+++ b/sys/arch/arm/arm32/fusu.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fusu.S,v 1.9 2000/12/12 06:36:19 mycroft Exp $	*/
+/*	$NetBSD: fusu.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1996-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/intr.c b/sys/arch/arm/arm32/intr.c
similarity index 98%
rename from sys/arch/arm32/arm32/intr.c
rename to sys/arch/arm/arm32/intr.c
index 905a22e86688..ee914dec2007 100644
--- a/sys/arch/arm32/arm32/intr.c
+++ b/sys/arch/arm/arm32/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.24 2001/04/24 18:21:10 bjh21 Exp $	*/
+/*	$NetBSD: intr.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/mem.c b/sys/arch/arm/arm32/mem.c
similarity index 98%
rename from sys/arch/arm32/arm32/mem.c
rename to sys/arch/arm/arm32/mem.c
index 05d5d9ed5a36..2d3df52a86e0 100644
--- a/sys/arch/arm32/arm32/mem.c
+++ b/sys/arch/arm/arm32/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.18 2001/07/28 11:17:15 chris Exp $	*/
+/*	$NetBSD: mem.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/arm32/arm32/procfs_machdep.c b/sys/arch/arm/arm32/procfs_machdep.c
similarity index 80%
rename from sys/arch/arm32/arm32/procfs_machdep.c
rename to sys/arch/arm/arm32/procfs_machdep.c
index c43d78017e9b..6d9f43470131 100644
--- a/sys/arch/arm32/arm32/procfs_machdep.c
+++ b/sys/arch/arm/arm32/procfs_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.1 2001/01/17 00:07:21 fvdl Exp $	*/
+/*	$NetBSD: procfs_machdep.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm32/arm32/setcpsr.S b/sys/arch/arm/arm32/setcpsr.S
similarity index 97%
rename from sys/arch/arm32/arm32/setcpsr.S
rename to sys/arch/arm/arm32/setcpsr.S
index 962d07f24bc0..4694cedafcf9 100644
--- a/sys/arch/arm32/arm32/setcpsr.S
+++ b/sys/arch/arm/arm32/setcpsr.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: setcpsr.S,v 1.4 1998/04/01 22:59:25 mark Exp $	*/
+/*	$NetBSD: setcpsr.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/setstack.S b/sys/arch/arm/arm32/setstack.S
similarity index 97%
rename from sys/arch/arm32/arm32/setstack.S
rename to sys/arch/arm/arm32/setstack.S
index d613a5f6e8e6..11c1fd014ff8 100644
--- a/sys/arch/arm32/arm32/setstack.S
+++ b/sys/arch/arm/arm32/setstack.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: setstack.S,v 1.4 1998/04/01 23:00:14 mark Exp $	*/
+/*	$NetBSD: setstack.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/spl.S b/sys/arch/arm/arm32/spl.S
similarity index 98%
rename from sys/arch/arm32/arm32/spl.S
rename to sys/arch/arm/arm32/spl.S
index 9be31353b646..8a443d427a97 100644
--- a/sys/arch/arm32/arm32/spl.S
+++ b/sys/arch/arm/arm32/spl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: spl.S,v 1.7 1999/10/26 06:53:41 cgd Exp $	*/
+/*	$NetBSD: spl.S,v 1.1 2001/07/28 13:28:04 chris Exp $	*/
 
 /*
  * Copyright (c) 1996-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/stubs.c b/sys/arch/arm/arm32/stubs.c
similarity index 99%
rename from sys/arch/arm32/arm32/stubs.c
rename to sys/arch/arm/arm32/stubs.c
index 8139d6498a96..199ba827da8c 100644
--- a/sys/arch/arm32/arm32/stubs.c
+++ b/sys/arch/arm/arm32/stubs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stubs.c,v 1.33 2001/03/31 12:22:38 toshii Exp $	*/
+/*	$NetBSD: stubs.c,v 1.1 2001/07/28 13:28:04 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
diff --git a/sys/arch/arm32/arm32/vm_machdep.c b/sys/arch/arm/arm32/vm_machdep.c
similarity index 98%
rename from sys/arch/arm32/arm32/vm_machdep.c
rename to sys/arch/arm/arm32/vm_machdep.c
index eb1aef066c3d..f3fa7df5390e 100644
--- a/sys/arch/arm32/arm32/vm_machdep.c
+++ b/sys/arch/arm/arm32/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.58 2001/06/02 18:09:10 chs Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.1 2001/07/28 13:28:04 chris Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -276,8 +276,8 @@ pagemove(from, to, size)
 		printf("pagemove: V%p to %p size %08x\n", from, to, size);
 #endif	/* PMAP_DEBUG */
 
-	fpte = vtopte(from);
-	tpte = vtopte(to);
+	fpte = vtopte((vaddr_t)from);
+	tpte = vtopte((vaddr_t)to);
 
 	/*
 	 * Make sure the cache does not have dirty data for the
@@ -293,7 +293,7 @@ pagemove(from, to, size)
 		*fpte++ = 0;
 		size -= NBPG;
 	}
-	cpu_tlb_flushD();
+	//cpu_tlb_flushD();
 }
 
 extern struct vm_map *phys_map;
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 8d2b4998402d..22878f31085c 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.34 2001/07/10 20:43:57 bjh21 Exp $
+#	$NetBSD: files.arm,v 1.35 2001/07/28 13:28:08 chris Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defopt	ARM32
@@ -58,11 +58,25 @@ file	arch/arm/arm/undefined.c
 file	arch/arm/arm/vm_machdep_arm.c
 
 # files common to arm32 implementations
+file	arch/arm/arm32/arm32_machdep.c		arm32
 file	arch/arm/arm32/ast.c			arm32
+file	arch/arm/arm32/bus_dma.c		arm32
 file	arch/arm/arm32/cpu.c			arm32 & cpu
+file	arch/arm/arm32/cpuswitch.S		arm32
+file	arch/arm/arm32/exception.S		arm32
+file	arch/arm/arm32/fault.c			arm32
+file	arch/arm/arm32/fusu.S			arm32
+file	arch/arm/arm32/intr.c			arm32
+file	arch/arm/arm32/mem.c			arm32
 file	arch/arm/arm32/pmap.c			arm32
+file	arch/arm/arm32/procfs_machdep.c		arm32 & procfs
+file	arch/arm/arm32/setcpsr.S		arm32
+file	arch/arm/arm32/setstack.S		arm32
+file	arch/arm/arm32/spl.S			arm32
+file	arch/arm/arm32/stubs.c			arm32
 file	arch/arm/arm32/syscall.c		arm32
 file	arch/arm/arm32/sys_machdep.c		arm32
+file	arch/arm/arm32/vm_machdep.c		arm32
 
 # arm32 library functions
 file	arch/arm/arm32/bcopy_page.S		arm32
diff --git a/sys/arch/arm32/conf/files.arm32 b/sys/arch/arm32/conf/files.arm32
index 607a652c1f6a..035f2f6c85a8 100644
--- a/sys/arch/arm32/conf/files.arm32
+++ b/sys/arch/arm32/conf/files.arm32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm32,v 1.124 2001/07/08 15:41:55 bjh21 Exp $
+#	$NetBSD: files.arm32,v 1.125 2001/07/28 13:28:04 chris Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -337,21 +337,7 @@ file	arch/arm32/vidc/console/dumb.c 		vt
 
 # Generic MD files
 file	arch/arm32/arm32/autoconf.c
-file	arch/arm32/arm32/bus_dma.c
 file	arch/arm32/arm32/conf.c
-file	arch/arm32/arm32/cpuswitch.S
-file	arch/arm32/arm32/stubs.c
-file	arch/arm32/arm32/exception.S
-file	arch/arm32/arm32/fault.c
-file	arch/arm32/arm32/mem.c
-file	arch/arm32/arm32/procfs_machdep.c	procfs
-file	arch/arm32/arm32/machdep.c
-file	arch/arm32/arm32/vm_machdep.c
-file	arch/arm32/arm32/fusu.S
-file	arch/arm32/arm32/setcpsr.S
-file	arch/arm32/arm32/setstack.S
-file	arch/arm32/arm32/spl.S
-file	arch/arm32/arm32/intr.c
 
 file	arch/arm/arm/disksubr.c			disk
 file	arch/arm/arm/disksubr_acorn.c		disk
diff --git a/sys/arch/cats/conf/files.cats b/sys/arch/cats/conf/files.cats
index 29ecfd5e53a6..dabade3946ad 100644
--- a/sys/arch/cats/conf/files.cats
+++ b/sys/arch/cats/conf/files.cats
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cats,v 1.7 2001/06/20 22:14:34 chris Exp $
+#	$NetBSD: files.cats,v 1.8 2001/07/28 13:28:04 chris Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -74,20 +74,6 @@ major   {cd = 26}
 file	arch/cats/cats/autoconf.c
 file	arch/cats/cats/conf.c
 file	arch/cats/cats/cats_machdep.c
-file	arch/arm32/arm32/bus_dma.c
-file	arch/arm32/arm32/cpuswitch.S
-file	arch/arm32/arm32/exception.S
-file	arch/arm32/arm32/fault.c
-file	arch/arm32/arm32/fusu.S
-file	arch/arm32/arm32/intr.c
-file	arch/arm32/arm32/machdep.c
-file	arch/arm32/arm32/mem.c
-file	arch/arm32/arm32/procfs_machdep.c	procfs
-file	arch/arm32/arm32/setcpsr.S
-file	arch/arm32/arm32/setstack.S
-file	arch/arm32/arm32/spl.S
-file	arch/arm32/arm32/stubs.c
-file	arch/arm32/arm32/vm_machdep.c
 
 # library functions
 
diff --git a/sys/arch/dnard/conf/files.dnard b/sys/arch/dnard/conf/files.dnard
index 433fe6e2a9c5..367c6def7db7 100644
--- a/sys/arch/dnard/conf/files.dnard
+++ b/sys/arch/dnard/conf/files.dnard
@@ -1,4 +1,4 @@
-#	$NetBSD: files.dnard,v 1.12 2001/06/21 23:11:48 chris Exp $
+#	$NetBSD: files.dnard,v 1.13 2001/07/28 13:28:04 chris Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -83,23 +83,6 @@ include "dev/scsipi/files.scsipi"
 major   {sd = 24}
 major   {cd = 26}
 
-# Generic MD files
-file	arch/arm32/arm32/bus_dma.c
-file	arch/arm32/arm32/conf.c
-file	arch/arm32/arm32/cpuswitch.S
-file	arch/arm32/arm32/exception.S
-file	arch/arm32/arm32/fault.c
-file	arch/arm32/arm32/fusu.S
-file	arch/arm32/arm32/intr.c
-file	arch/arm32/arm32/machdep.c
-file	arch/arm32/arm32/mem.c
-file	arch/arm32/arm32/procfs_machdep.c	procfs
-file	arch/arm32/arm32/setcpsr.S
-file	arch/arm32/arm32/setstack.S
-file	arch/arm32/arm32/spl.S
-file	arch/arm32/arm32/stubs.c
-file	arch/arm32/arm32/vm_machdep.c
-
 # library functions
 
 file	arch/arm/arm/disksubr.c			disk
diff --git a/sys/arch/netwinder/conf/files.netwinder b/sys/arch/netwinder/conf/files.netwinder
index 655ee3d38496..82b496509489 100644
--- a/sys/arch/netwinder/conf/files.netwinder
+++ b/sys/arch/netwinder/conf/files.netwinder
@@ -1,4 +1,4 @@
-#	$NetBSD: files.netwinder,v 1.13 2001/06/20 22:14:35 chris Exp $
+#	$NetBSD: files.netwinder,v 1.14 2001/07/28 13:28:04 chris Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -72,27 +72,11 @@ include "dev/scsipi/files.scsipi"
 major   {sd = 24}
 major   {cd = 26}
 
+# Generic MD files
 file	arch/netwinder/netwinder/autoconf.c
 file	arch/netwinder/netwinder/conf.c
 file	arch/netwinder/netwinder/netwinder_machdep.c
 
-
-# Generic MD files
-file	arch/arm32/arm32/bus_dma.c
-file	arch/arm32/arm32/cpuswitch.S
-file	arch/arm32/arm32/stubs.c
-file	arch/arm32/arm32/exception.S
-file	arch/arm32/arm32/fault.c
-file	arch/arm32/arm32/mem.c
-file	arch/arm32/arm32/procfs_machdep.c	procfs
-file	arch/arm32/arm32/machdep.c
-file	arch/arm32/arm32/vm_machdep.c
-file	arch/arm32/arm32/fusu.S
-file	arch/arm32/arm32/setcpsr.S
-file	arch/arm32/arm32/setstack.S
-file	arch/arm32/arm32/spl.S
-file	arch/arm32/arm32/intr.c
-
 file	arch/arm/arm/disksubr.c			disk
 file	arch/arm/arm/disksubr_acorn.c		disk
 file	arch/arm/arm/disksubr_mbr.c		disk