From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
Will Deacon <will@kernel•org>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
Anshuman Khandual <anshuman.khandual@arm•com>,
Linus Walleij <linus.walleij@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Wed, 3 Jan 2024 10:03:24 +1100 [thread overview]
Message-ID: <20240103100324.05f47bb8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/kernel/perf_event_v6.c
between commit:
5cd7da19cb97 ("arm: perf: Remove PMU locking")
from the arm-perf tree and commit:
ced296f63635 ("ARM: Delete ARM11MPCore perf leftovers")
from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/kernel/perf_event_v6.c
index 8fc080c9e4fb,0cbf46233d6b..000000000000
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
@@@ -436,35 -386,9 +373,8 @@@ static void armv6pmu_disable_event(stru
val &= ~mask;
val |= evt;
armv6_pmcr_write(val);
- raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
}
- static void armv6mpcore_pmu_disable_event(struct perf_event *event)
- {
- unsigned long val, mask, evt = 0;
- struct hw_perf_event *hwc = &event->hw;
- int idx = hwc->idx;
-
- if (ARMV6_CYCLE_COUNTER == idx) {
- mask = ARMV6_PMCR_CCOUNT_IEN;
- } else if (ARMV6_COUNTER0 == idx) {
- mask = ARMV6_PMCR_COUNT0_IEN;
- } else if (ARMV6_COUNTER1 == idx) {
- mask = ARMV6_PMCR_COUNT1_IEN;
- } else {
- WARN_ONCE(1, "invalid counter number (%d)\n", idx);
- return;
- }
-
- /*
- * Unlike UP ARMv6, we don't have a way of stopping the counters. We
- * simply disable the interrupt reporting.
- */
- val = armv6_pmcr_read();
- val &= ~mask;
- val |= evt;
- armv6_pmcr_write(val);
- }
-
static int armv6_map_event(struct perf_event *event)
{
return armpmu_map_event(event, &armv6_perf_map,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-01-02 23:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 23:03 Stephen Rothwell [this message]
2024-01-03 17:30 ` linux-next: manual merge of the arm-soc tree with the arm-perf tree Will Deacon
2024-01-03 17:38 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2015-03-23 0:33 Stephen Rothwell
2015-03-23 14:41 ` Abhilash Kesavan
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 21:16 ` Stephen Rothwell
2015-03-24 14:59 ` Suzuki K. Poulose
2014-02-21 0:58 Stephen Rothwell
2014-02-21 1:02 ` Olof Johansson
2014-02-21 11:09 ` Will Deacon
2014-02-22 0:46 ` Olof Johansson
2014-02-21 1:02 ` Stephen Boyd
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=20240103100324.05f47bb8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=will@kernel$(echo .)org \
/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