From 46202be72499234d144ecaa48e1fc32c73251f1c Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Mon, 4 Jun 2007 14:47:04 +1000 Subject: [PATCH] --- yaml --- r: 60554 b: refs/heads/master c: 35923f12e42a3baf4ac6da7c05cf5f7478e5a7c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/irq.c | 6 ++++++ trunk/include/asm-powerpc/irq.h | 5 +---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c52e52174477..fff5efad4c35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0e80206cc42334032f18edee0ab591b0f275e12 +refs/heads/master: 35923f12e42a3baf4ac6da7c05cf5f7478e5a7c6 diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c index b74b0fd764b2..0a769893c5c3 100644 --- a/trunk/arch/powerpc/kernel/irq.c +++ b/trunk/arch/powerpc/kernel/irq.c @@ -411,6 +411,12 @@ struct irq_map_entry irq_map[NR_IRQS]; static unsigned int irq_virq_count = NR_IRQS; static struct irq_host *irq_default_host; +irq_hw_number_t virq_to_hw(unsigned int virq) +{ + return irq_map[virq].hwirq; +} +EXPORT_SYMBOL_GPL(virq_to_hw); + struct irq_host *irq_alloc_host(unsigned int revmap_type, unsigned int revmap_arg, struct irq_host_ops *ops, diff --git a/trunk/include/asm-powerpc/irq.h b/trunk/include/asm-powerpc/irq.h index 4734cc178db5..05dd5a3eb3aa 100644 --- a/trunk/include/asm-powerpc/irq.h +++ b/trunk/include/asm-powerpc/irq.h @@ -138,10 +138,7 @@ struct irq_map_entry { extern struct irq_map_entry irq_map[NR_IRQS]; -static inline irq_hw_number_t virq_to_hw(unsigned int virq) -{ - return irq_map[virq].hwirq; -} +extern irq_hw_number_t virq_to_hw(unsigned int virq); /** * irq_alloc_host - Allocate a new irq_host data structure