Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6811986 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: arm/arm64: Detangle kvm_mmu.h from kvm_hyp.h 



kvm_hyp.h has an odd dependency on kvm_mmu.h, which makes the
opposite inclusion impossible. Let's start with breaking that
useless dependency.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent f3721c70

arch/arm/include/asm/kvm_hyp.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/compiler.h>

#include <linux/kvm_host.h>

#include <asm/cp15.h>

#include <asm/kvm_mmu.h>

#include <asm/vfp.h>



#define __hyp_text __section(.hyp.text) notrace

arch/arm/kvm/hyp/switch.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <asm/kvm_asm.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>



__asm__(".arch_extension     virt");

arch/arm/kvm/hyp/tlb.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>



/**

 * Flush per-VMID TLBs

arch/arm64/include/asm/kvm_hyp.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include <linux/compiler.h>

#include <linux/kvm_host.h>

#include <asm/kvm_mmu.h>

#include <asm/sysreg.h>



#define __hyp_text __section(.hyp.text) notrace

arch/arm64/kvm/hyp/debug-sr.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/debug-monitors.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>



#define read_debug(r,n)		read_sysreg(r##n##_el1)

#define write_debug(v,r,n)	write_sysreg(v, r##n##_el1)