---

yaml --- r: 372097 b: refs/heads/master c: 06fe0b7 h: refs/heads/master i: 372095: add6ba4 v: v3
git-mirror · Mar 6, 2013 · 58bbced · 58bbced
1 parent 73e08c1
commit 58bbced
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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>