From fd21abac5e22ddcffdd27090aa1993e06ec8df7e Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Fri, 1 Jun 2007 17:23:26 +1000 Subject: [PATCH] --- yaml --- r: 57295 b: refs/heads/master c: f5921697cf5cae68dcbfa881d9e08f3cebef47eb h: refs/heads/master i: 57293: dabffdeea4702666c80867e4c62705ed9e92e72d 57291: a17305c1ca2fb05a4d48d549e04fe9c0938f4e42 57287: 68f49f64aab2c5c507b4bb6f2ddcd4b9c06a12e8 57279: a283285e09ba79c58d438a6c24f88fe0b1349c15 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/irq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aa7465fd212f..64c084bfe5e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71 +refs/heads/master: f5921697cf5cae68dcbfa881d9e08f3cebef47eb diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c index 068377a2a8dc..42c8ed6ed528 100644 --- a/trunk/arch/powerpc/kernel/irq.c +++ b/trunk/arch/powerpc/kernel/irq.c @@ -489,7 +489,7 @@ struct irq_host *irq_alloc_host(unsigned int revmap_type, case IRQ_HOST_MAP_LINEAR: rmap = (unsigned int *)(host + 1); for (i = 0; i < revmap_arg; i++) - rmap[i] = IRQ_NONE; + rmap[i] = NO_IRQ; host->revmap_data.linear.size = revmap_arg; smp_wmb(); host->revmap_data.linear.revmap = rmap; @@ -614,7 +614,7 @@ unsigned int irq_create_mapping(struct irq_host *host, * host->ops->map() to update the flags */ virq = irq_find_mapping(host, hwirq); - if (virq != IRQ_NONE) { + if (virq != NO_IRQ) { if (host->ops->remap) host->ops->remap(host, virq, hwirq); pr_debug("irq: -> existing mapping on virq %d\n", virq); @@ -741,7 +741,7 @@ void irq_dispose_mapping(unsigned int virq) switch(host->revmap_type) { case IRQ_HOST_MAP_LINEAR: if (hwirq < host->revmap_data.linear.size) - host->revmap_data.linear.revmap[hwirq] = IRQ_NONE; + host->revmap_data.linear.revmap[hwirq] = NO_IRQ; break; case IRQ_HOST_MAP_TREE: /* Check if radix tree allocated yet */