From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Will Deacon <will.deacon@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mark Rutland <mark.rutland@arm•com>
Subject: linux-next: manual merge of the arm-perf tree with Linus' and teh arm-current trees
Date: Fri, 29 May 2015 11:14:32 +1000 [thread overview]
Message-ID: <20150529111432.397105d2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
Hi Will,
Today's linux-next merge of the arm-perf tree got a conflict in
arch/arm/kernel/perf_event_cpu.c between commit 338d9dd3e2ae ("ARM:
8351/1: perf: don't warn about missing interrupt-affinity property for
PPIs") from Linus' tree and 8d2812849acb ("ARM: 8357/1: perf: fix
memory leak when probing PMU PPIs") from the arm-current tree and
commit 64d0d3943e14 ("arm: perf: make of_pmu_irq_cfg take arm_pmu")
from the arm-perf tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/kernel/perf_event_cpu.c
index 3b8c2833c537,50f245bf4e05..000000000000
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@@ -301,17 -306,12 +306,18 @@@ static int probe_current_pmu(struct arm
return ret;
}
- static int of_pmu_irq_cfg(struct platform_device *pdev)
+ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
{
- int i;
+ int i, irq;
+ struct platform_device *pdev = pmu->plat_device;
- int *irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL);
+ int *irqs;
+ /* Don't bother with PPIs; they're already affine */
+ irq = platform_get_irq(pdev, 0);
+ if (irq >= 0 && irq_is_percpu(irq))
+ return 0;
+
+ irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL);
if (!irqs)
return -ENOMEM;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-29 1:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 1:14 Stephen Rothwell [this message]
2015-05-29 10:21 ` linux-next: manual merge of the arm-perf tree with Linus' and teh arm-current trees Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150529111432.397105d2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox