summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-25 20:30:53 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 14:48:03 +0200
commit91ce72e08047190291777ec56598118225910203 (patch)
tree0b6f23ea1cd63246e55bd5cdb84a35e9e624f846
parent459960d831d14924eb4bcccadeb03ec81a1f524c (diff)
ia64: iosapic: Use new irq_move_* functions
The current functions are going away. Also use the accessor for pending setaffinity in irq_data instead of the open coded irq_desc access. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/ia64/kernel/iosapic.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 920983545ad6..b0f9afebb146 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -398,7 +398,7 @@ iosapic_unmask_level_irq (struct irq_data *data)
int do_unmask_irq = 0;
irq_complete_move(irq);
- if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {
+ if (unlikely(irqd_is_setaffinity_pending(data))) {
do_unmask_irq = 1;
mask_irq(data);
} else
@@ -408,7 +408,7 @@ iosapic_unmask_level_irq (struct irq_data *data)
iosapic_eoi(rte->iosapic->addr, vec);
if (unlikely(do_unmask_irq)) {
- move_masked_irq(irq);
+ irq_move_masked_irq(data);
unmask_irq(data);
}
}
@@ -449,10 +449,8 @@ iosapic_startup_edge_irq (struct irq_data *data)
static void
iosapic_ack_edge_irq (struct irq_data *data)
{
- unsigned int irq = data->irq;
-
- irq_complete_move(irq);
- move_native_irq(irq);
+ irq_complete_move(data->irq);
+ irq_move_irq(data);
}
#define iosapic_enable_edge_irq unmask_irq