tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arm64: KVM: Move kvm/hyp/hyp.h to include/asm/kvm_hyp.h

In order to be able to move code outside of kvm/hyp, we need to make
the global hyp.h file accessible from a standard location.

include/asm/kvm_hyp.h seems good enough.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

Marc Zyngier 13720a56 1f364c8c

+8 -20
+1 -3
arch/arm64/kvm/hyp/debug-sr.c
··· 19 19 #include <linux/kvm_host.h> 20 20 21 21 #include <asm/kvm_asm.h> 22 - #include <asm/kvm_mmu.h> 23 - 24 - #include "hyp.h" 22 + #include <asm/kvm_hyp.h> 25 23 26 24 #define read_debug(r,n) read_sysreg(r##n##_el1) 27 25 #define write_debug(v,r,n) write_sysreg(v, r##n##_el1)
arch/arm64/kvm/hyp/hyp.h arch/arm64/include/asm/kvm_hyp.h
+1 -2
arch/arm64/kvm/hyp/s2-setup.c
··· 18 18 #include <linux/types.h> 19 19 #include <asm/kvm_arm.h> 20 20 #include <asm/kvm_asm.h> 21 - 22 - #include "hyp.h" 21 + #include <asm/kvm_hyp.h> 23 22 24 23 void __hyp_text __init_stage2_translation(void) 25 24 {
+1 -2
arch/arm64/kvm/hyp/switch.c
··· 17 17 18 18 #include <linux/types.h> 19 19 #include <asm/kvm_asm.h> 20 - 21 - #include "hyp.h" 20 + #include <asm/kvm_hyp.h> 22 21 23 22 static bool __hyp_text __fpsimd_enabled_nvhe(void) 24 23 {
+1 -3
arch/arm64/kvm/hyp/sysreg-sr.c
··· 19 19 #include <linux/kvm_host.h> 20 20 21 21 #include <asm/kvm_asm.h> 22 - #include <asm/kvm_mmu.h> 23 - 24 - #include "hyp.h" 22 + #include <asm/kvm_hyp.h> 25 23 26 24 /* Yes, this does nothing, on purpose */ 27 25 static void __hyp_text __sysreg_do_nothing(struct kvm_cpu_context *ctxt) { }
+1 -3
arch/arm64/kvm/hyp/timer-sr.c
··· 19 19 #include <linux/compiler.h> 20 20 #include <linux/kvm_host.h> 21 21 22 - #include <asm/kvm_mmu.h> 23 - 24 - #include "hyp.h" 22 + #include <asm/kvm_hyp.h> 25 23 26 24 /* vcpu is already in the HYP VA space */ 27 25 void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu)
+1 -1
arch/arm64/kvm/hyp/tlb.c
··· 15 15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 16 */ 17 17 18 - #include "hyp.h" 18 + #include <asm/kvm_hyp.h> 19 19 20 20 static void __hyp_text __tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) 21 21 {
+1 -3
arch/arm64/kvm/hyp/vgic-v2-sr.c
··· 19 19 #include <linux/irqchip/arm-gic.h> 20 20 #include <linux/kvm_host.h> 21 21 22 - #include <asm/kvm_mmu.h> 23 - 24 - #include "hyp.h" 22 + #include <asm/kvm_hyp.h> 25 23 26 24 /* vcpu is already in the HYP VA space */ 27 25 void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)
+1 -3
arch/arm64/kvm/hyp/vgic-v3-sr.c
··· 19 19 #include <linux/irqchip/arm-gic-v3.h> 20 20 #include <linux/kvm_host.h> 21 21 22 - #include <asm/kvm_mmu.h> 23 - 24 - #include "hyp.h" 22 + #include <asm/kvm_hyp.h> 25 23 26 24 #define vtr_to_max_lr_idx(v) ((v) & 0xf) 27 25 #define vtr_to_nr_pri_bits(v) (((u32)(v) >> 29) + 1)