* [GIT PULL] irq fixes
@ 2011-09-30 18:16 Ingo Molnar
2011-09-30 18:35 ` Josh Boyer
2011-09-30 19:43 ` Thomas Gleixner
0 siblings, 2 replies; 4+ messages in thread
From: Ingo Molnar @ 2011-09-30 18:16 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Thomas Gleixner, Peter Zijlstra, Andrew Morton
Linus,
Please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-urgent-for-linus
Thanks,
Ingo
------------------>
Rob Herring (2):
irq: Add declaration of irq_domain_simple_ops to irqdomain.h
irq: Fix check for already initialized irq_domain in irq_domain_add
include/linux/irqdomain.h | 1 +
kernel/irq/irqdomain.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index e807ad6..3ad553e 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -80,6 +80,7 @@ extern void irq_domain_del(struct irq_domain *domain);
#endif /* CONFIG_IRQ_DOMAIN */
#if defined(CONFIG_IRQ_DOMAIN) && defined(CONFIG_OF_IRQ)
+extern struct irq_domain_ops irq_domain_simple_ops;
extern void irq_domain_add_simple(struct device_node *controller, int irq_base);
extern void irq_domain_generate_simple(const struct of_device_id *match,
u64 phys_base, unsigned int irq_start);
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index d5828da..b57a377 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -29,7 +29,11 @@ void irq_domain_add(struct irq_domain *domain)
*/
for (hwirq = 0; hwirq < domain->nr_irq; hwirq++) {
d = irq_get_irq_data(irq_domain_to_irq(domain, hwirq));
- if (d || d->domain) {
+ if (!d) {
+ WARN(1, "error: assigning domain to non existant irq_desc");
+ return;
+ }
+ if (d->domain) {
/* things are broken; just report, don't clean up */
WARN(1, "error: irq_desc already assigned to a domain");
return;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [GIT PULL] irq fixes
2011-09-30 18:16 [GIT PULL] irq fixes Ingo Molnar
@ 2011-09-30 18:35 ` Josh Boyer
2011-09-30 19:43 ` Thomas Gleixner
1 sibling, 0 replies; 4+ messages in thread
From: Josh Boyer @ 2011-09-30 18:35 UTC (permalink / raw)
To: Ingo Molnar
Cc: Linus Torvalds, linux-kernel, Thomas Gleixner, Peter Zijlstra,
Andrew Morton
On Fri, Sep 30, 2011 at 2:16 PM, Ingo Molnar <mingo@elte.hu> wrote:
> Linus,
>
> Please pull the latest irq-urgent-for-linus git tree from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-urgent-for-linus
That would be a neat trick... Did you mean some other location?
git.kernel.org still isn't back as far as I know.
josh
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] irq fixes
2011-09-30 18:16 [GIT PULL] irq fixes Ingo Molnar
2011-09-30 18:35 ` Josh Boyer
@ 2011-09-30 19:43 ` Thomas Gleixner
2011-10-01 7:01 ` [GIT PULL, v2] " Ingo Molnar
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Gleixner @ 2011-09-30 19:43 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Linus Torvalds, linux-kernel, Peter Zijlstra, Andrew Morton
On Fri, 30 Sep 2011, Ingo Molnar wrote:
> Linus,
>
> Please pull the latest irq-urgent-for-linus git tree from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-urgent-for-linus
>
git://tesla.tglx.de/git/linux-2.6-tip irq-urgent-for-linus
might actually work
Thanks,
tglx
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL, v2] irq fixes
2011-09-30 19:43 ` Thomas Gleixner
@ 2011-10-01 7:01 ` Ingo Molnar
0 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2011-10-01 7:01 UTC (permalink / raw)
To: Thomas Gleixner, Linus Torvalds
Cc: linux-kernel, Peter Zijlstra, Andrew Morton
* Thomas Gleixner <tglx@linutronix.de> wrote:
>
> git://tesla.tglx.de/git/linux-2.6-tip irq-urgent-for-linus
>
> might actually work
Erm, indeed korg is down so that URI won't work, silly me.
Linus, here's the updated pull request:
Please pull the latest irq-urgent-for-linus git tree from:
git://tesla.tglx.de/git/linux-2.6-tip.git irq-urgent-for-linus
Thanks,
Ingo
------------------>
Rob Herring (2):
irq: Add declaration of irq_domain_simple_ops to irqdomain.h
irq: Fix check for already initialized irq_domain in irq_domain_add
include/linux/irqdomain.h | 1 +
kernel/irq/irqdomain.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index e807ad6..3ad553e 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -80,6 +80,7 @@ extern void irq_domain_del(struct irq_domain *domain);
#endif /* CONFIG_IRQ_DOMAIN */
#if defined(CONFIG_IRQ_DOMAIN) && defined(CONFIG_OF_IRQ)
+extern struct irq_domain_ops irq_domain_simple_ops;
extern void irq_domain_add_simple(struct device_node *controller, int irq_base);
extern void irq_domain_generate_simple(const struct of_device_id *match,
u64 phys_base, unsigned int irq_start);
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index d5828da..b57a377 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -29,7 +29,11 @@ void irq_domain_add(struct irq_domain *domain)
*/
for (hwirq = 0; hwirq < domain->nr_irq; hwirq++) {
d = irq_get_irq_data(irq_domain_to_irq(domain, hwirq));
- if (d || d->domain) {
+ if (!d) {
+ WARN(1, "error: assigning domain to non existant irq_desc");
+ return;
+ }
+ if (d->domain) {
/* things are broken; just report, don't clean up */
WARN(1, "error: irq_desc already assigned to a domain");
return;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-01 7:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-30 18:16 [GIT PULL] irq fixes Ingo Molnar
2011-09-30 18:35 ` Josh Boyer
2011-09-30 19:43 ` Thomas Gleixner
2011-10-01 7:01 ` [GIT PULL, v2] " Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox