diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2018-05-31 18:09:38 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-05-31 18:09:38 +0100 |
| commit | cb877710e58f7266215fbf2d51516c9fc6993019 (patch) | |
| tree | 297c230b887c9325879fb09fe11e1c334fd616b2 /include/linux | |
| parent | 5d81f7dc9bca4f4963092433e27b508cbe524a32 (diff) | |
| parent | 73acc0315cd72174729141856c6607d1c91419cb (diff) | |
| download | lwn-cb877710e58f7266215fbf2d51516c9fc6993019.tar.gz lwn-cb877710e58f7266215fbf2d51516c9fc6993019.zip | |
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux
- perf/arm-cci: allow building as module
- perf/arm-ccn: demote dev_warn() to dev_dbg() in event_init()
- miscellaneous perf/arm cleanups
* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
ARM: mcpm, perf/arm-cci: export mcpm_is_available
drivers/bus: arm-cci: fix build warnings
drivers/perf: Remove ARM_SPE_PMU explicit PERF_EVENTS dependency
drivers/perf: arm-ccn: don't log to dmesg in event_init
perf/arm-cci: Allow building as a module
perf/arm-cci: Remove pointless PMU disabling
perf/arm-cc*: Fix MODULE_LICENSE() tags
arm_pmu: simplify arm_pmu::handle_irq
perf/arm-cci: Remove unnecessary period adjustment
perf: simplify getting .drvdata
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf/arm_pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 40036a57d072..ad5444491975 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -78,7 +78,7 @@ struct arm_pmu { struct pmu pmu; cpumask_t supported_cpus; char *name; - irqreturn_t (*handle_irq)(int irq_num, void *dev); + irqreturn_t (*handle_irq)(struct arm_pmu *pmu); void (*enable)(struct perf_event *event); void (*disable)(struct perf_event *event); int (*get_event_idx)(struct pmu_hw_events *hw_events, |