summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2013-04-28 14:39:15 +0000
committerpatrick <patrick@openbsd.org>2013-04-28 14:39:15 +0000
commit2c35ef2586bed5011598540c015b9d2532e029ff (patch)
treeea0c534da339ff9b1e352918e2d87b8a2ae95fc7
parentImproved dealing of ARMv7 faults. Added ARMv7 fault descriptions. (diff)
downloadwireguard-openbsd-2c35ef2586bed5011598540c015b9d2532e029ff.tar.xz
wireguard-openbsd-2c35ef2586bed5011598540c015b9d2532e029ff.zip
Revert the ARMv7 header split introduced in pmap7.
ok bmercer@
-rw-r--r--sys/arch/arm/arm/pmap7.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index 6002d13e075..4890e1712ac 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap7.c,v 1.3 2013/04/16 14:44:13 patrick Exp $ */
+/* $OpenBSD: pmap7.c,v 1.4 2013/04/28 14:39:15 patrick Exp $ */
/* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */
/*
@@ -192,9 +192,7 @@
#include <machine/pmap.h>
#include <machine/pcb.h>
#include <machine/param.h>
-#include <arm/cpufuncv7.h>
-#include <arm/pmapv7.h>
-#include <arm/ptev7.h>
+#include <arm/cpufunc.h>
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG