Commit f5c5c225 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-v4.7-rc6' of... 

Merge tag 'kvm-arm-for-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.7-rc6:

Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
parents ff30ef40 591d215a

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 
	kvm_timer_vcpu_terminate(vcpu);

	kvm_vgic_vcpu_destroy(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);

	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}

include/kvm/arm_pmu.h

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
#ifndef __ASM_ARM_KVM_PMU_H

#define __ASM_ARM_KVM_PMU_H



#ifdef CONFIG_KVM_ARM_PMU



#include <linux/perf_event.h>

#include <asm/perf_event.h>



#define ARMV8_PMU_CYCLE_IDX		(ARMV8_PMU_MAX_COUNTERS - 1)



#ifdef CONFIG_KVM_ARM_PMU



struct kvm_pmc {

	u8 idx;	/* index into the pmu->pmc array */

	struct perf_event *perf_event;