diff options
| author | Robert Richter <robert.richter@amd.com> | 2011-11-08 15:52:15 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2011-11-08 15:52:15 +0100 |
| commit | de346b6949063aa040ef607943b072835294f4b3 (patch) | |
| tree | 11f5a10b9ab41a10ea26bf8ab1f133b802e7559e /kernel/irq | |
| parent | dcfce4a095932e6e95d83ad982be3609947963bc (diff) | |
| parent | 9c48f1c629ecfa114850c03f875c6691003214de (diff) | |
| download | linux-de346b6949063aa040ef607943b072835294f4b3.tar.gz linux-de346b6949063aa040ef607943b072835294f4b3.tar.bz2 linux-de346b6949063aa040ef607943b072835294f4b3.zip | |
Merge branch 'perf/core' into oprofile/master
Merge reason: Resolve conflicts with Don's NMI rework:
commit 9c48f1c629ecfa114850c03f875c6691003214de
Author: Don Zickus <dzickus@redhat.com>
Date: Fri Sep 30 15:06:21 2011 -0400
x86, nmi: Wire up NMI handlers to new routines
Conflicts:
arch/x86/oprofile/nmi_timer_int.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/irqdomain.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index d5828da3fd38..b57a3776de44 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; |