Commit 8cbebc41 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Replace KVM_ARM_PMU with HW_PERF_EVENTS 



KVM_ARM_PMU only existed for the benefit of 32bit ARM hosts,
and makes no sense now that we are 64bit only. Get rid of it.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 957cbca7

arch/arm64/kvm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ if KVM 


source "virt/kvm/Kconfig"



config KVM_ARM_PMU

	bool "Virtual Performance Monitoring Unit (PMU) support"

	depends on HW_PERF_EVENTS

	default y

	help

	  Adds support for a virtual Performance Monitoring Unit (PMU) in

	  virtual machines.



endif # KVM



endif # VIRTUALIZATION

arch/arm64/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \ 
	 vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \

	 vgic/vgic-its.o vgic/vgic-debug.o



kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
 
kvm-$(CONFIG_HW_PERF_EVENTS)  += pmu-emul.o

include/kvm/arm_pmu.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define ARMV8_PMU_CYCLE_IDX		(ARMV8_PMU_MAX_COUNTERS - 1)

#define ARMV8_PMU_MAX_COUNTER_PAIRS	((ARMV8_PMU_MAX_COUNTERS + 1) >> 1)



#ifdef CONFIG_KVM_ARM_PMU

#ifdef CONFIG_HW_PERF_EVENTS



struct kvm_pmc {

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