diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
| commit | bf3c0e5e7102f5787d693379d9d384b813fe890b (patch) | |
| tree | aa48fc57dee9ecdf99918affa38d1b06be41419a /arch/arc/kernel/perf_event.c | |
| parent | 32251b07d532174d66941488c112ec046f646157 (diff) | |
| parent | 976bc5e2aceedef13e0ba1f0e6e372a22164aa0c (diff) | |
| download | kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.gz kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.bz2 kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.zip | |
Merge branch 'x86-seves-for-paolo' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD
Diffstat (limited to 'arch/arc/kernel/perf_event.c')
| -rw-r--r-- | arch/arc/kernel/perf_event.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c index 661fd842ea97..79849f37e782 100644 --- a/arch/arc/kernel/perf_event.c +++ b/arch/arc/kernel/perf_event.c @@ -562,7 +562,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) { struct arc_reg_pct_build pct_bcr; struct arc_reg_cc_build cc_bcr; - int i, has_interrupts; + int i, has_interrupts, irq; int counter_size; /* in bits */ union cc_name { @@ -637,13 +637,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) .attr_groups = arc_pmu->attr_groups, }; - if (has_interrupts) { - int irq = platform_get_irq(pdev, 0); - - if (irq < 0) { - pr_err("Cannot get IRQ number for the platform\n"); - return -ENODEV; - } + if (has_interrupts && (irq = platform_get_irq(pdev, 0) >= 0)) { arc_pmu->irq = irq; @@ -652,9 +646,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev) this_cpu_ptr(&arc_pmu_cpu)); on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1); - - } else + } else { arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT; + } /* * perf parser doesn't really like '-' symbol in events name, so let's |