diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-01-04 17:50:16 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-01-04 17:50:16 +0100 |
| commit | 8cbebc4118b5933b3ae6351ceb433f75ac6b7c6b (patch) | |
| tree | f500e3dbbeada8785404e337a8baf0c45b0788ae /arch | |
| parent | KVM: arm64: Remove spurious semicolon in reg_to_encoding() (diff) | |
| download | linux-8cbebc4118b5933b3ae6351ceb433f75ac6b7c6b.tar.xz linux-8cbebc4118b5933b3ae6351ceb433f75ac6b7c6b.zip | |
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: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm64/kvm/Makefile | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 043756db8f6e..3964acf5451e 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -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 diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 60fd181df624..13b017284bf9 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -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 |