summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-12-17 11:57:24 +0000
committerChristoffer Dall <cdall@cs.columbia.edu>2013-03-06 15:48:45 -0800
commit06fe0b73ff17e5d777af1b26f3e227d79c0d6808 (patch)
tree39cfd754b726143d5287dbc374c977b49ba72814
parentd7bb077737f34ed474a7256e1f368df6373238fa (diff)
downloadlinux-06fe0b73ff17e5d777af1b26f3e227d79c0d6808.tar.bz2
ARM: KVM: move include of asm/idmap.h to kvm_mmu.h
Since the arm64 code doesn't have a global asm/idmap.h file, move the inclusion to asm/kvm_mmu.h. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--arch/arm/include/asm/kvm_mmu.h1
-rw-r--r--arch/arm/kvm/mmu.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 3c71a1d4b7a3..970f3b5fa109 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -21,6 +21,7 @@
#include <asm/cacheflush.h>
#include <asm/pgalloc.h>
+#include <asm/idmap.h>
/*
* We directly use the kernel VA for the HYP, as we can directly share
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index efded4f1a11b..692f064fde0a 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -20,7 +20,6 @@
#include <linux/kvm_host.h>
#include <linux/io.h>
#include <trace/events/kvm.h>
-#include <asm/idmap.h>
#include <asm/pgalloc.h>
#include <asm/cacheflush.h>
#include <asm/kvm_arm.h>