From 58bbcedaa9a29ff66050d3582aab2503bfd41890 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Mon, 17 Dec 2012 11:57:24 +0000
Subject: [PATCH] --- yaml --- r: 372097 b: refs/heads/master c:
 06fe0b73ff17e5d777af1b26f3e227d79c0d6808 h: refs/heads/master i:   372095:
 add6ba461db02f8d1c0cfa588aeefcded37d7e8a v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/include/asm/kvm_mmu.h | 1 +
 trunk/arch/arm/kvm/mmu.c             | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 14ab49809b73..c2d38a8e6e2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7bb077737f34ed474a7256e1f368df6373238fa
+refs/heads/master: 06fe0b73ff17e5d777af1b26f3e227d79c0d6808
diff --git a/trunk/arch/arm/include/asm/kvm_mmu.h b/trunk/arch/arm/include/asm/kvm_mmu.h
index 3c71a1d4b7a3..970f3b5fa109 100644
--- a/trunk/arch/arm/include/asm/kvm_mmu.h
+++ b/trunk/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/trunk/arch/arm/kvm/mmu.c b/trunk/arch/arm/kvm/mmu.c
index efded4f1a11b..692f064fde0a 100644
--- a/trunk/arch/arm/kvm/mmu.c
+++ b/trunk/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>