diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2018-05-31 20:09:38 +0300 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-05-31 20:09:38 +0300 |
| commit | cb877710e58f7266215fbf2d51516c9fc6993019 (patch) | |
| tree | 297c230b887c9325879fb09fe11e1c334fd616b2 /arch/arm64/kernel | |
| parent | 5d81f7dc9bca4f4963092433e27b508cbe524a32 (diff) | |
| parent | 73acc0315cd72174729141856c6607d1c91419cb (diff) | |
| download | linux-cb877710e58f7266215fbf2d51516c9fc6993019.tar.xz | |
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 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 85a251b6dfa8..33147aacdafd 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -670,11 +670,10 @@ static void armv8pmu_disable_event(struct perf_event *event) raw_spin_unlock_irqrestore(&events->pmu_lock, flags); } -static irqreturn_t armv8pmu_handle_irq(int irq_num, void *dev) +static irqreturn_t armv8pmu_handle_irq(struct arm_pmu *cpu_pmu) { u32 pmovsr; struct perf_sample_data data; - struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev; struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events); struct pt_regs *regs; int idx; |