diff options
author | Olof Johansson <olof@lixom.net> | 2007-06-04 00:47:04 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-01 23:29:21 -0400 |
commit | 9f7905812e5919862acb6ede63e10d3d1bb4958e (patch) | |
tree | 8d0489c4a83888996843490d9ac0d85e471b7538 | |
parent | ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8 (diff) |
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
Uninline virq_to_hw and export it so modules can use it. The alternative
would be to export the irq_map array instead, but it's an infrequently
called function, and keeping the array unexported seems considerably
cleaner.
This is needed so that the pasemi_mac driver can be compiled as a module.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/irq.c | 6 | ||||
-rw-r--r-- | include/asm-powerpc/irq.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 42c8ed6ed528..c2b84c64db20 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -412,6 +412,12 @@ struct irq_map_entry irq_map[NR_IRQS]; | |||
412 | static unsigned int irq_virq_count = NR_IRQS; | 412 | static unsigned int irq_virq_count = NR_IRQS; |
413 | static struct irq_host *irq_default_host; | 413 | static struct irq_host *irq_default_host; |
414 | 414 | ||
415 | irq_hw_number_t virq_to_hw(unsigned int virq) | ||
416 | { | ||
417 | return irq_map[virq].hwirq; | ||
418 | } | ||
419 | EXPORT_SYMBOL_GPL(virq_to_hw); | ||
420 | |||
415 | struct irq_host *irq_alloc_host(unsigned int revmap_type, | 421 | struct irq_host *irq_alloc_host(unsigned int revmap_type, |
416 | unsigned int revmap_arg, | 422 | unsigned int revmap_arg, |
417 | struct irq_host_ops *ops, | 423 | struct irq_host_ops *ops, |
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index 4734cc178db5..05dd5a3eb3aa 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h | |||
@@ -138,10 +138,7 @@ struct irq_map_entry { | |||
138 | 138 | ||
139 | extern struct irq_map_entry irq_map[NR_IRQS]; | 139 | extern struct irq_map_entry irq_map[NR_IRQS]; |
140 | 140 | ||
141 | static inline irq_hw_number_t virq_to_hw(unsigned int virq) | 141 | extern irq_hw_number_t virq_to_hw(unsigned int virq); |
142 | { | ||
143 | return irq_map[virq].hwirq; | ||
144 | } | ||
145 | 142 | ||
146 | /** | 143 | /** |
147 | * irq_alloc_host - Allocate a new irq_host data structure | 144 | * irq_alloc_host - Allocate a new irq_host data structure |