TMP

diff --git a/sys/arm/conf/XENVIRT b/sys/arm/conf/XENVIRT
index ff6433392e6fc2d5fa7c1ad1f7c40155003af9a8..43ae0f938b4389a1ead1d60d459e6645f5dc04a8 100644 (file)
--- a/sys/arm/conf/XENVIRT
+++ b/sys/arm/conf/XENVIRT
@@ -21,6 +21,7 @@ ident         XENVIRT
 
 cpu            CPU_CORTEXA
 machine        arm armv6
+makeoptions    CONF_CFLAGS="-march=armv7a"
 makeoption     ARM_LITTLE_ENDIAN
 
 options        XENHVM

diff --git a/sys/arm/xenvirt/files.xenvirt b/sys/arm/xenvirt/files.xenvirt
index 6b6da8e47bac6731d2cd4a91422f94d206367225..f789138bacdcd8baa478790fe96e721e6584407d 100644 (file)
--- a/sys/arm/xenvirt/files.xenvirt
+++ b/sys/arm/xenvirt/files.xenvirt
@@ -5,7 +5,7 @@ arm/arm/bus_space_generic.c                     standard
 arm/arm/cpufunc_asm_armv7.S                    standard
 arm/arm/cpufunc_asm_arm11.S                    standard
 
-arm/arm/bus_space-v6.c                         standard
+arm/arm/bus_space_base.c                       standard
 arm/arm/gic.c                                  standard
 arm/arm/generic_timer.c                                standard
 

diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c
index a80c8f6bd4f980fb38560978601ef7ca3a5f8cac..72ba986658e314d62ae28d9be2c96c3901e7dd9a 100644 (file)
--- a/sys/dev/mmc/host/dwmmc.c
+++ b/sys/dev/mmc/host/dwmmc.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/intr_machdep.h>
 
 #include <dev/mmc/host/dwmmc_reg.h>
 #include <dev/mmc/host/dwmmc_var.h>