summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-06-30 17:11:20 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-06-30 17:11:20 +0200
commitf5c5c225fce4cb98fe4451d4c4d654e3f18b9f82 (patch)
treedc81d86b30c035f23e8fc4712bf16804af7ccc12 /include
parentff30ef40deca4658e27b0c596e7baf39115e858f (diff)
parent591d215afcc2f94e8e2c69a63c924c044677eb31 (diff)
downloadlinux-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.tar.bz2
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.
Diffstat (limited to 'include')
-rw-r--r--include/kvm/arm_pmu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
index fe389ac31489..92e7e97ca8ff 100644
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
@@ -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;