Index: cpufunc.c
===================================================================
RCS file: /home/ncvs/src/sys/arm/arm/cpufunc.c,v
retrieving revision 1.7
diff -u -p -r1.7 cpufunc.c
--- cpufunc.c	18 Feb 2005 17:29:12 -0000	1.7
+++ cpufunc.c	20 Feb 2005 02:01:57 -0000
@@ -1850,8 +1850,8 @@ arm9_setup(args)
 		 | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
 		 | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
 		 | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
-		 | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
-		 | CPU_CONTROL_CPCLK;
+		 | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_VECRELOC
+		 | CPU_CONTROL_ROUNDROBIN;
 
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
 	cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -1869,7 +1869,7 @@ arm9_setup(args)
 	cpu_idcache_wbinv_all();
 
 	/* Set the control register */
-	cpu_control(0xffffffff, cpuctrl);
+	cpu_control(cpuctrlmask, cpuctrl);
 	ctrl = cpuctrl;
 
 }