From d37d49df18d57edb1de71fd077ce41d7a3f751f2 Mon Sep 17 00:00:00 2001 From: Jeremy Gebben Date: Tue, 26 Apr 2016 09:40:36 -0600 Subject: Revert "Perf: arm64: fix disable of pmu irq during hotplug" This reverts commit 09e03e5113703a70 ("Perf: arm64: fix disable of pmu irq during hotplug") This change is being reverted so that it can be replaced by equivalent functionality from upstream. CRs-Fixed: 1008368 Change-Id: Ie3140289f1f4dd2bdf0c3fdb315369d763d53b22 Signed-off-by: Jeremy Gebben --- include/linux/perf/arm_pmu.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/linux') diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 136e2e9da1ee..f5c6d5cd8950 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -51,12 +51,6 @@ struct arm_pmu_platdata { }, \ } -enum arm_pmu_state { - ARM_PMU_STATE_OFF = 0, - ARM_PMU_STATE_GOING_DOWN, - ARM_PMU_STATE_RUNNING, -}; - /* The events for a given PMU register set. */ struct pmu_hw_events { /* @@ -109,7 +103,6 @@ struct arm_pmu { void (*free_irq)(struct arm_pmu *); int (*map_event)(struct perf_event *event); int num_events; - int pmu_state; int percpu_irq; atomic_t active_events; struct mutex reserve_mutex; -- cgit v1.2.3