diff options
| author | Jeremy Gebben <jgebben@codeaurora.org> | 2016-04-26 09:41:04 -0600 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-04-27 19:05:02 -0700 |
| commit | b7bc440547a2d88746c834524d601915dc00c155 (patch) | |
| tree | d9ab10755937c7a19cb050df6ef38452b6f0d0f5 /include/linux | |
| parent | d37d49df18d57edb1de71fd077ce41d7a3f751f2 (diff) | |
Revert "Perf: arm64: support hotplug and power collapse"
This reverts commit 0e4ee435ac293483
("Perf: arm64: support hotplug and power collapse")
This change is being reverted so that it can be replaced
by equivalent functionality from upstream.
CRs-Fixed: 1008368
Change-Id: I464549b185625314a9f2844272bdce617ce988e4
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf/arm_pmu.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index f5c6d5cd8950..41ba95b30df4 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -64,8 +64,6 @@ struct pmu_hw_events { */ DECLARE_BITMAP(used_mask, ARMPMU_MAX_HWEVENTS); - u32 *from_idle; - /* * Hardware lock to serialize accesses to PMU registers. Needed for the * read/modify/write sequences. @@ -103,15 +101,12 @@ struct arm_pmu { void (*free_irq)(struct arm_pmu *); int (*map_event)(struct perf_event *event); int num_events; - int percpu_irq; atomic_t active_events; struct mutex reserve_mutex; u64 max_period; struct platform_device *plat_device; struct pmu_hw_events __percpu *hw_events; struct notifier_block hotplug_nb; - void (*save_pm_registers)(void *hcpu); - void (*restore_pm_registers)(void *hcpu); }; #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu)) |