mirror of https://gitee.com/openkylin/linux.git
ARM: KVM: Move kvm/hyp/hyp.h to include/asm/kvm_hyp.h
In order to be able to use the code located in virt/kvm/arm/hyp, we need to make the global hyp.h file accessible from include/asm, similar to what we did for arm64. Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
parent
6d50d54cd8
commit
f1c9cad7c5
|
@ -18,7 +18,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "hyp.h"
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
__asm__(".arch_extension virt");
|
__asm__(".arch_extension virt");
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "hyp.h"
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
static u64 *cp15_64(struct kvm_cpu_context *ctxt, int idx)
|
static u64 *cp15_64(struct kvm_cpu_context *ctxt, int idx)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,8 +18,7 @@
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <asm/kvm_arm.h>
|
#include <asm/kvm_arm.h>
|
||||||
#include <asm/kvm_asm.h>
|
#include <asm/kvm_asm.h>
|
||||||
|
#include <asm/kvm_hyp.h>
|
||||||
#include "hyp.h"
|
|
||||||
|
|
||||||
void __hyp_text __init_stage2_translation(void)
|
void __hyp_text __init_stage2_translation(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <asm/kvm_asm.h>
|
#include <asm/kvm_asm.h>
|
||||||
#include "hyp.h"
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
__asm__(".arch_extension virt");
|
__asm__(".arch_extension virt");
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
|
|
||||||
#include <asm/kvm_mmu.h>
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
#include "hyp.h"
|
|
||||||
|
|
||||||
/* vcpu is already in the HYP VA space */
|
/* vcpu is already in the HYP VA space */
|
||||||
void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu)
|
void __hyp_text __timer_save_state(struct kvm_vcpu *vcpu)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "hyp.h"
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flush per-VMID TLBs
|
* Flush per-VMID TLBs
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
#include <linux/irqchip/arm-gic.h>
|
#include <linux/irqchip/arm-gic.h>
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
|
|
||||||
#include <asm/kvm_mmu.h>
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
#include "hyp.h"
|
|
||||||
|
|
||||||
/* vcpu is already in the HYP VA space */
|
/* vcpu is already in the HYP VA space */
|
||||||
void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)
|
void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)
|
||||||
|
|
Loading…
Reference in New Issue