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: linux-next: manual merge of the lost-spurious-irq tree with the tip tree
Date: Tue, 5 Oct 2010 14:12:58 +1100 [thread overview]
Message-ID: <20101005141258.af27dee9.sfr@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the lost-spurious-irq tree got a conflict in
kernel/irq/internals.h between commits
a77c4635915021c646cc017f22239e66d1aab4d5 ("genirq: Add new functions to
dummy chips") 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.
Just context changes. I fixed it up (see below) and can carry the fixes
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc kernel/irq/internals.h
index b905f0a,1b24309..0000000
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@@ -2,10 -2,6 +2,8 @@@
* IRQ subsystem internal functions and variables:
*/
- extern int noirqdebug;
-
+#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
+
/* Set default functions for irq_chip structures: */
extern void irq_chip_set_defaults(struct irq_chip *chip);
@@@ -42,27 -38,23 +40,33 @@@ extern int irq_select_affinity_usr(unsi
extern void irq_set_thread_affinity(struct irq_desc *desc);
+#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
+static inline void irq_end(unsigned int irq, struct irq_desc *desc)
+{
+ if (desc->irq_data.chip && desc->irq_data.chip->end)
+ desc->irq_data.chip->end(irq);
+}
+#else
+static inline void irq_end(unsigned int irq, struct irq_desc *desc) { }
+#endif
+
+ extern void poll_irq(unsigned long arg);
+ extern void irq_poll_action_added(struct irq_desc *desc,
+ struct irqaction *action);
+ extern void irq_poll_action_removed(struct irq_desc *desc,
+ struct irqaction *action);
+
/* Inline functions for support of irq chips on slow busses */
-static inline void chip_bus_lock(unsigned int irq, struct irq_desc *desc)
+static inline void chip_bus_lock(struct irq_desc *desc)
{
- if (unlikely(desc->chip->bus_lock))
- desc->chip->bus_lock(irq);
+ if (unlikely(desc->irq_data.chip->irq_bus_lock))
+ desc->irq_data.chip->irq_bus_lock(&desc->irq_data);
}
-static inline void chip_bus_sync_unlock(unsigned int irq, struct irq_desc *desc)
+static inline void chip_bus_sync_unlock(struct irq_desc *desc)
{
- if (unlikely(desc->chip->bus_sync_unlock))
- desc->chip->bus_sync_unlock(irq);
+ if (unlikely(desc->irq_data.chip->irq_bus_sync_unlock))
+ desc->irq_data.chip->irq_bus_sync_unlock(&desc->irq_data);
}
/*
@@@ -76,11 -68,11 +80,11 @@@
static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
{
printk("irq %d, desc: %p, depth: %d, count: %d, unhandled: %d\n",
- irq, desc, desc->depth, desc->irq_count, desc->irqs_unhandled);
+ irq, desc, desc->depth, desc->spr.nr_samples, desc->spr.nr_bad);
printk("->handle_irq(): %p, ", desc->handle_irq);
print_symbol("%s\n", (unsigned long)desc->handle_irq);
- printk("->chip(): %p, ", desc->chip);
- print_symbol("%s\n", (unsigned long)desc->chip);
+ printk("->irq_data.chip(): %p, ", desc->irq_data.chip);
+ print_symbol("%s\n", (unsigned long)desc->irq_data.chip);
printk("->action(): %p\n", desc->action);
if (desc->action) {
printk("->action->handler(): %p, ", desc->action->handler);
next reply other threads:[~2010-10-05 3:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-05 3:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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
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=20101005141258.af27dee9.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