diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-06-21 20:16:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:32 -0400 |
commit | b77d6adc922b8bbf8b16b67f567958c42962cf88 (patch) | |
tree | 6d212543f10d0330b73ec3932d17c97a1da56bdf /kernel/irq | |
parent | faec1e99ba9ca7371d9aee1656938373133c4b21 (diff) |
[PATCH] uml: make hw_controller_type->release exist only for archs needing it
With Chris Wedgwood <cw@f00f.org>
As suggested by Chris, we can make the "just added" method ->release
conditional to UML only (better: to archs requesting it, i.e. only UML
currently), so that other archs don't get this unneeded crud, and if UML
won't need it any more we can kill this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
CC: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 5fde8177eedf..ac6700985705 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -6,6 +6,7 @@ | |||
6 | * This file contains driver APIs to the irq subsystem. | 6 | * This file contains driver APIs to the irq subsystem. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
9 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
10 | #include <linux/module.h> | 11 | #include <linux/module.h> |
11 | #include <linux/random.h> | 12 | #include <linux/random.h> |
@@ -256,8 +257,11 @@ void free_irq(unsigned int irq, void *dev_id) | |||
256 | /* Found it - now remove it from the list of entries */ | 257 | /* Found it - now remove it from the list of entries */ |
257 | *pp = action->next; | 258 | *pp = action->next; |
258 | 259 | ||
260 | /* Currently used only by UML, might disappear one day.*/ | ||
261 | #ifdef CONFIG_IRQ_RELEASE_METHOD | ||
259 | if (desc->handler->release) | 262 | if (desc->handler->release) |
260 | desc->handler->release(irq, dev_id); | 263 | desc->handler->release(irq, dev_id); |
264 | #endif | ||
261 | 265 | ||
262 | if (!desc->action) { | 266 | if (!desc->action) { |
263 | desc->status |= IRQ_DISABLED; | 267 | desc->status |= IRQ_DISABLED; |