From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 14 Nov 2016 13:52:47 +0000 (+0800)
Subject: arm64/kvm: fix build issue on kvm debug
X-Git-Tag: firefly_0821_release~176^2~4^2~18^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3ee568c134543eaaebeb3b559cfca11709dad01;p=firefly-linux-kernel-4.4.55.git

arm64/kvm: fix build issue on kvm debug

Add the header file asm/debug-monitors.h into debug-sr.c to fix the following bug
arch/arm64/kvm/hyp/debug-sr.c: In function ‘__debug_cond_save_host_state’:
arch/arm64/kvm/hyp/debug-sr.c:118:45: error: ‘DBG_MDSCR_KDE’ undeclared (first use in this function)
  if ((vcpu->arch.ctxt.sys_regs[MDSCR_EL1] & DBG_MDSCR_KDE) ||
                                             ^~~~~~~~~~~~~
arch/arm64/kvm/hyp/debug-sr.c:118:45: note: each undeclared identifier is reported only once for each function it appears in
arch/arm64/kvm/hyp/debug-sr.c:119:45: error: ‘DBG_MDSCR_MDE’ undeclared (first use in this function)
      (vcpu->arch.ctxt.sys_regs[MDSCR_EL1] & DBG_MDSCR_MDE))
                                             ^~~~~~~~~~~~~

Signed-off-by: Alex Shi <alex.shi@linaro.org>
---

diff --git a/arch/arm64/kvm/hyp/debug-sr.c b/arch/arm64/kvm/hyp/debug-sr.c
index c9c1e97501a9..2f8bca8af295 100644
--- a/arch/arm64/kvm/hyp/debug-sr.c
+++ b/arch/arm64/kvm/hyp/debug-sr.c
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <linux/kvm_host.h>
 
+#include <asm/debug-monitors.h>
 #include <asm/kvm_asm.h>
 #include <asm/kvm_mmu.h>