diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 17:14:52 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 17:14:52 +0900 |
| commit | f38770477a30d03b6296570071ca2fcd6d3a5f11 (patch) | |
| tree | 3dd11460c4115d97137a6ff82683e593a3813607 /arch | |
| parent | 1ca8fe38a6c958babe6571e39cb0115a40b94603 (diff) | |
| parent | 1d6a21b0a672fb29b01ccf397d478e0541e17716 (diff) | |
| download | kernel-common-f38770477a30d03b6296570071ca2fcd6d3a5f11.tar.gz kernel-common-f38770477a30d03b6296570071ca2fcd6d3a5f11.tar.bz2 kernel-common-f38770477a30d03b6296570071ca2fcd6d3a5f11.zip | |
Merge branch 'common/irqdomain' into sh-latest
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/sysdev/xics/icp-hv.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/xics/icp-native.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/xics/xics-common.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c index 253dce98c16e..14469cf9df68 100644 --- a/arch/powerpc/sysdev/xics/icp-hv.c +++ b/arch/powerpc/sysdev/xics/icp-hv.c @@ -111,7 +111,7 @@ static unsigned int icp_hv_get_irq(void) if (vec == XICS_IRQ_SPURIOUS) return NO_IRQ; - irq = irq_radix_revmap_lookup(xics_host, vec); + irq = irq_find_mapping(xics_host, vec); if (likely(irq != NO_IRQ)) { xics_push_cppr(vec); return irq; diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c index 4c79b6fbee1c..48861d3fcd07 100644 --- a/arch/powerpc/sysdev/xics/icp-native.c +++ b/arch/powerpc/sysdev/xics/icp-native.c @@ -119,7 +119,7 @@ static unsigned int icp_native_get_irq(void) if (vec == XICS_IRQ_SPURIOUS) return NO_IRQ; - irq = irq_radix_revmap_lookup(xics_host, vec); + irq = irq_find_mapping(xics_host, vec); if (likely(irq != NO_IRQ)) { xics_push_cppr(vec); return irq; diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c index cd1d18db92c6..9049d9f44485 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c @@ -329,9 +329,6 @@ static int xics_host_map(struct irq_domain *h, unsigned int virq, pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw); - /* Insert the interrupt mapping into the radix tree for fast lookup */ - irq_radix_revmap_insert(xics_host, virq, hw); - /* They aren't all level sensitive but we just don't really know */ irq_set_status_flags(virq, IRQ_LEVEL); |