diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-04 05:16:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:29 -0400 |
commit | 1f80025e624bb14fefadfef7e80fbfb9740d4714 (patch) | |
tree | 1d6f18ebd2855e882213922036d8df8cd7e88db4 /kernel/irq/chip.c | |
parent | 8b955b0dddb35e398b07e217a81f8bd49400796f (diff) |
[PATCH] msi: simplify msi sanity checks by adding with generic irq code
Currently msi.c is doing sanity checks that make certain before an irq is
destroyed it has no more users.
By adding irq_has_action I can perform the test is a generic way, instead of
relying on a msi specific data structure.
By performing the core check in dynamic_irq_cleanup I ensure every user of
dynamic irqs has a test present and we don't free resources that are in use.
In msi.c this allows me to kill the attrib.state member of msi_desc and all of
the assciated code to maintain it.
To keep from freeing data structures when irq cleanup code is called to soon
changing dyanamic_irq_cleanup is insufficient because there are msi specific
data structures that are also not safe to free.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <greg@kroah.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 0dc24386dd99..4cf65f5c6a74 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -67,6 +67,13 @@ void dynamic_irq_cleanup(unsigned int irq) | |||
67 | 67 | ||
68 | desc = irq_desc + irq; | 68 | desc = irq_desc + irq; |
69 | spin_lock_irqsave(&desc->lock, flags); | 69 | spin_lock_irqsave(&desc->lock, flags); |
70 | if (desc->action) { | ||
71 | spin_unlock_irqrestore(&desc->lock, flags); | ||
72 | printk(KERN_ERR "Destroying IRQ%d without calling free_irq\n", | ||
73 | irq); | ||
74 | WARN_ON(1); | ||
75 | return; | ||
76 | } | ||
70 | desc->handle_irq = handle_bad_irq; | 77 | desc->handle_irq = handle_bad_irq; |
71 | desc->chip = &no_irq_chip; | 78 | desc->chip = &no_irq_chip; |
72 | spin_unlock_irqrestore(&desc->lock, flags); | 79 | spin_unlock_irqrestore(&desc->lock, flags); |