diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index caef32cdc39..c8f6ed591c2 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -242,9 +242,6 @@ struct cpu_functions sheeva_cpufuncs = {
 
 #ifdef CPU_MV_PJ4B
 struct cpu_functions pj4bv7_cpufuncs = {
-	/* MMU functions */
-	.cf_control = cpufunc_control,
-	.cf_setttb = armv7_setttb,
 
 	/* Cache operations */
 	.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@@ -254,7 +251,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
 	.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
 
 	/* Other functions */
-	.cf_drain_writebuf = armv7_drain_writebuf,
 	.cf_sleep = (void *)cpufunc_nullop,
 
 	/* Soft functions */
@@ -418,9 +414,6 @@ struct cpu_functions fa526_cpufuncs = {
 
 #if defined(CPU_ARM1176)
 struct cpu_functions arm1176_cpufuncs = {
-	/* MMU functions */
-	.cf_control = cpufunc_control,
-	.cf_setttb = arm11x6_setttb,
 
 	/* Cache operations */
 	.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@@ -430,7 +423,6 @@ struct cpu_functions arm1176_cpufuncs = {
 	.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
 
 	/* Other functions */
-	.cf_drain_writebuf = arm11_drain_writebuf,
 	.cf_sleep = arm11x6_sleep, 
 
 	/* Soft functions */
@@ -440,9 +432,6 @@ struct cpu_functions arm1176_cpufuncs = {
 
 #if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 struct cpu_functions cortexa_cpufuncs = {
-	/* MMU functions */
-	.cf_control = cpufunc_control,
-	.cf_setttb = armv7_setttb,
 
 	/* Cache operations */
 
@@ -457,7 +446,6 @@ struct cpu_functions cortexa_cpufuncs = {
 	.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
 
 	/* Other functions */
-	.cf_drain_writebuf = armv7_drain_writebuf,
 	.cf_sleep = armv7_cpu_sleep,
 
 	/* Soft functions */
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 4a9dd99dd85..2958b27e271 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -412,7 +412,7 @@ arm_vector_init(vm_offset_t va, int which)
 	icache_sync(va, (ARM_NVEC * 2) * sizeof(u_int));
 
 	vector_page = va;
-
+#if __ARM_ARCH < 6
 	if (va == ARM_VECTORS_HIGH) {
 		/*
 		 * Enable high vectors in the system control reg (SCTLR).
@@ -427,6 +427,7 @@ arm_vector_init(vm_offset_t va, int which)
 		 */
 		cpu_control(CPU_CONTROL_VECRELOC, CPU_CONTROL_VECRELOC);
 	}
+#endif
 }
 
 static void
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index 3bf52c7e36c..58d423f9035 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -61,14 +61,12 @@ struct cpu_functions {
 	/* CPU functions */
 #if __ARM_ARCH < 6
 	void	(*cf_cpwait)		(void);
-#endif
 
 	/* MMU functions */
 
 	u_int	(*cf_control)		(u_int bic, u_int eor);
 	void	(*cf_setttb)		(u_int ttb);
 
-#if __ARM_ARCH < 6
 	/* TLB functions */
 
 	void	(*cf_tlb_flushID)	(void);
@@ -150,7 +148,9 @@ struct cpu_functions {
 
 	/* Other functions */
 
+#if __ARM_ARCH < 6
 	void	(*cf_drain_writebuf)	(void);
+#endif
 
 	void	(*cf_sleep)		(int mode);