From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Helge Deller <deller@gmx•de>, Parisc List <linux-parisc@vger•kernel.org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jiang Liu <jiang.liu@linux•intel.com>,
Thomas Gleixner <tglx@linutronix•de>
Subject: linux-next: manual merge of the parisc-hd tree with Linus' tree
Date: Tue, 8 Sep 2015 09:01:37 +1000 [thread overview]
Message-ID: <20150908090137.1b93713a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the parisc-hd tree got a conflict in:
arch/parisc/kernel/irq.c
between commit:
d2109a12198e ("parisc/irq: Use access helper irq_data_get_affinity_mask()")
from Linus' tree and commit:
b15e2f939727 ("parisc: Filter out spurious interrupts in PA-RISC irq handler")
from the parisc-hd 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/parisc/kernel/irq.c
index 413ec3c3f9cc,c0eab24f6a9e..000000000000
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@@ -507,8 -507,8 +507,8 @@@ void do_cpu_irq_mask(struct pt_regs *re
struct pt_regs *old_regs;
unsigned long eirr_val;
int irq, cpu = smp_processor_id();
- #ifdef CONFIG_SMP
- struct irq_desc *desc;
+ struct irq_data *irq_data;
+ #ifdef CONFIG_SMP
cpumask_t dest;
#endif
@@@ -521,10 -521,14 +521,14 @@@
goto set_out;
irq = eirr_to_irq(eirr_val);
- #ifdef CONFIG_SMP
+ irq_data = irq_get_irq_data(irq);
+ /* Filter out spurious interrupts, mostly from serial port at bootup */
- desc = irq_to_desc(irq);
- if (unlikely(!desc->action))
++ if (unlikely(!irq_data))
+ goto set_out;
+
+ #ifdef CONFIG_SMP
- cpumask_copy(&dest, desc->irq_data.affinity);
- if (irqd_is_per_cpu(&desc->irq_data) &&
+ cpumask_copy(&dest, irq_data_get_affinity_mask(irq_data));
+ if (irqd_is_per_cpu(irq_data) &&
!cpumask_test_cpu(smp_processor_id(), &dest)) {
int cpu = cpumask_first(&dest);
next reply other threads:[~2015-09-07 23:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-07 23:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-04 0:27 linux-next: manual merge of the parisc-hd tree with Linus' tree Stephen Rothwell
2014-02-04 8:48 ` Helge Deller
2013-05-27 0:51 Stephen Rothwell
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=20150908090137.1b93713a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=deller@gmx$(echo .)de \
--cc=jiang.liu@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/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