diff options
| author |   patrick <patrick@openbsd.org> | 2013-04-30 13:10:45 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2013-04-30 13:10:45 +0000 |
| commit | b3a7da0c53540c29bf77fc8b2ba13e2cee43f23a (patch) | |
| tree | cbd2cb782d4f4ca63566e9bfefef410cb11d3137 | |
| parent | various small fixes; (diff) | |
| download | wireguard-openbsd-b3a7da0c53540c29bf77fc8b2ba13e2cee43f23a.tar.xz wireguard-openbsd-b3a7da0c53540c29bf77fc8b2ba13e2cee43f23a.zip | |
Switch from pmap to pmap7.
ok bmercer@
| -rw-r--r-- | sys/arch/arm/conf/files.arm | 8 | ||||
| -rw-r--r-- | sys/arch/beagle/include/pmap.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm index 5b4cd0eaf77..91af6829041 100644 --- a/sys/arch/arm/conf/files.arm +++ b/sys/arch/arm/conf/files.arm @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm,v 1.22 2013/03/27 17:33:13 patrick Exp $ +# $OpenBSD: files.arm,v 1.23 2013/04/30 13:10:45 patrick Exp $ # $NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $ # generic networking files @@ -74,11 +74,13 @@ file arch/arm/arm/vectors.S file arch/arm/arm/arm32_machdep.c file arch/arm/arm/bus_dma.c file arch/arm/arm/cpu.c -file arch/arm/arm/cpuswitch.S +file arch/arm/arm/cpuswitch.S !cpu_armv7 +file arch/arm/arm/cpuswitch7.S cpu_armv7 file arch/arm/arm/exception.S file arch/arm/arm/fault.c file arch/arm/arm/mem.c -file arch/arm/arm/pmap.c +file arch/arm/arm/pmap.c !cpu_armv7 +file arch/arm/arm/pmap7.c cpu_armv7 file arch/arm/arm/setstack.S file arch/arm/arm/stubs.c file arch/arm/arm/sys_machdep.c diff --git a/sys/arch/beagle/include/pmap.h b/sys/arch/beagle/include/pmap.h index ccbd101418c..21e61ef8119 100644 --- a/sys/arch/beagle/include/pmap.h +++ b/sys/arch/beagle/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.2 2013/04/30 13:10:45 patrick Exp $ */ /* $NetBSD: pmap.h,v 1.2 2001/11/23 17:29:01 thorpej Exp $ */ -#include <arm/pmap.h> +#include <arm/pmap7.h> |