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

Commit b4c14c25 authored by Greg Hackmann's avatar Greg Hackmann
Browse files

Merge tag 'v4.9.95' into android-4.9.95 



This is the 4.9.95 stable release

Change-Id: I7b8c0b5f4ea5afaddbf9b77813efe675332bced0
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
parents 8683408f eedaf21f

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 94

SUBLEVEL = 95

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -318,4 +318,10 @@ static inline int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, 
	return -ENXIO;

}



static inline bool kvm_arm_harden_branch_predictor(void)

{

	/* No way to detect it yet, pretend it is not there. */

	return false;

}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/include/asm/kvm_mmu.h

+10 −0
Original line number Diff line number Diff line
@@ -223,6 +223,16 @@ static inline unsigned int kvm_get_vmid_bits(void) 
	return 8;

}



static inline void *kvm_get_hyp_vector(void)

{

	return kvm_ksym_ref(__kvm_hyp_vector);

}



static inline int kvm_map_vectors(void)

{

	return 0;

}



#endif	/* !__ASSEMBLY__ */



#endif /* __ARM_KVM_MMU_H__ */

arch/arm/kvm/arm.c

+9 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/kvm.h>

#include <trace/events/kvm.h>

#include <kvm/arm_pmu.h>

#include <kvm/arm_psci.h>



#define CREATE_TRACE_POINTS

#include "trace.h"
@@ -44,7 +45,6 @@ 
#include <asm/kvm_mmu.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_coproc.h>

#include <asm/kvm_psci.h>

#include <asm/sections.h>



#ifdef REQUIRES_VIRT
@@ -1088,7 +1088,7 @@ static void cpu_init_hyp_mode(void *dummy) 
	pgd_ptr = kvm_mmu_get_httbr();

	stack_page = __this_cpu_read(kvm_arm_hyp_stack_page);

	hyp_stack_ptr = stack_page + PAGE_SIZE;

	vector_ptr = (unsigned long)kvm_ksym_ref(__kvm_hyp_vector);

	vector_ptr = (unsigned long)kvm_get_hyp_vector();



	__cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);

	__cpu_init_stage2();
@@ -1345,6 +1345,13 @@ static int init_hyp_mode(void) 
		goto out_err;

	}





	err = kvm_map_vectors();

	if (err) {

		kvm_err("Cannot map vectors\n");

		goto out_err;

	}



	/*

	 * Map the Hyp stack pages

	 */

arch/arm/kvm/handle_exit.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <asm/kvm_emulate.h>

#include <asm/kvm_coproc.h>

#include <asm/kvm_mmu.h>

#include <asm/kvm_psci.h>

#include <kvm/arm_psci.h>

#include <trace/events/kvm.h>



#include "trace.h"
@@ -36,7 +36,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		      kvm_vcpu_hvc_get_imm(vcpu));

	vcpu->stat.hvc_exit_stat++;



	ret = kvm_psci_call(vcpu);

	ret = kvm_hvc_call_handler(vcpu);

	if (ret < 0) {

		vcpu_set_reg(vcpu, 0, ~0UL);

		return 1;