From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: manual merge of the lost-spurious-irq tree with the tip tree
Date: Tue, 5 Oct 2010 14:20:17 +1100 [thread overview]
Message-ID: <20101005142017.661c6ff9.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101005141334.6a0f15fd.sfr@canb.auug.org.au>
Hi Tejun,
On Tue, 5 Oct 2010 14:13:34 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the lost-spurious-irq tree got a conflict in
> kernel/irq/spurious.c between commits
> 6b8ff3120c758340505dddf08ad685ebb841d5d5 ("genirq: Convert core code to
> irq_data") and bd151412263a67b5321e9dd1d5b4bf6d96fdebf3 ("genirq: Provide
> config option to disable deprecated code") from the tip tree and commits
> 32b5d378f49485f3ae172eb0ac2bfc4ebbbdb060 ("irq: cleanup irqfixup") and
> 80f97e2b33c3e66c11b10abd2890506a3abeb320 ("irq: make spurious poll timer
> per desc") from the lost-spurious-irq tree.
>
> I think I fixed it all up (see below). I can carry this fix (or a better
> one) as necessary.
I then had to apply the following merge fix patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 5 Oct 2010 14:14:11 +1100
Subject: [PATCH] irq: fix for bus_lock API change
Due to commit 3876ec9ef3775d062345b3760d3271ecb8cd3fea ("genirq: Provide
compat handling for bus_lock/bus_sync_unlock") from the tip tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/irq/spurious.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index cfcd2e9..1f17127 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -878,7 +878,7 @@ void poll_irq(unsigned long arg)
return;
/* need to do locking dance for chip_bus_lock() to reenable IRQ */
- chip_bus_lock(desc->irq_data.irq, desc);
+ chip_bus_lock(desc);
raw_spin_lock_irq(&desc->lock);
/* make sure we haven't raced with anyone inbetween */
@@ -890,7 +890,7 @@ void poll_irq(unsigned long arg)
}
raw_spin_unlock_irq(&desc->lock);
- chip_bus_sync_unlock(desc->irq_data.irq, desc);
+ chip_bus_sync_unlock(desc);
}
void irq_poll_action_added(struct irq_desc *desc, struct irqaction *action)
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2010-10-05 3:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-05 3:13 linux-next: manual merge of the lost-spurious-irq tree with the tip tree Stephen Rothwell
2010-10-05 3:20 ` Stephen Rothwell [this message]
2010-10-05 5:47 ` Tejun Heo
2010-10-05 6:32 ` Ingo Molnar
2010-10-05 6:45 ` Stephen Rothwell
2010-10-05 7:01 ` Ingo Molnar
2010-10-05 8:38 ` Stephen Rothwell
2010-10-05 9:12 ` Ingo Molnar
2010-10-05 6:55 ` Tejun Heo
2010-10-05 6:59 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2010-10-05 3:12 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=20101005142017.661c6ff9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@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