From 8db19c62a4d789feff10c05b987501e4a552ecfa Mon Sep 17 00:00:00 2001
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Tue, 20 Jul 2004 22:39:24 +0000
Subject: [PATCH] Uncomment the vector relocation code.

---
 sys/arm/arm/cpufunc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 65e3acd09c59..1c8dbccfae0d 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -54,6 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/bus.h>
+#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/disassem.h>
 
@@ -2079,10 +2081,8 @@ ixp12x0_setup(args)
 	cpuctrl |= CPU_CONTROL_BEND_ENABLE;
 #endif
 
-#if 0
 	if (vector_page == ARM_VECTORS_HIGH)
 		cpuctrl |= CPU_CONTROL_VECRELOC;
-#endif
 
 	/* Clear out the cache */
 	cpu_idcache_wbinv_all();
@@ -2147,10 +2147,8 @@ xscale_setup(args)
 	cpuctrl |= CPU_CONTROL_BEND_ENABLE;
 #endif
 
-#if 0
 	if (vector_page == ARM_VECTORS_HIGH)
 		cpuctrl |= CPU_CONTROL_VECRELOC;
-#endif
 
 	/* Clear out the cache */
 	cpu_idcache_wbinv_all();