From d01e96fc1e85fd3f9617c43bf014b8bfa7596283 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 20:18:14 +0100 Subject: [PATCH] --- yaml --- r: 243311 b: refs/heads/master c: 41ef0203214644ad003e8dac0147a3e5b6381034 h: refs/heads/master i: 243309: 838948ac5cddc9bd3f59ca0a338dda2ebcb0fe03 243307: a2be6847087dc9a51c91676d2eec06bcd3b53ac1 243303: 70f7eaf2b8c736f5b99ca2983ffa7393eae1e50f 243295: d63a718dfaea04add5195168c0f4ce79d44bb403 v: v3 --- [refs] | 2 +- trunk/arch/ia64/xen/irq_xen.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e4b58987042..2480d52eda70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dea1078e1a67f3d877ef553e3189df20fcca54e0 +refs/heads/master: 41ef0203214644ad003e8dac0147a3e5b6381034 diff --git a/trunk/arch/ia64/xen/irq_xen.c b/trunk/arch/ia64/xen/irq_xen.c index a3fb7cf9ae1d..108bb858acf2 100644 --- a/trunk/arch/ia64/xen/irq_xen.c +++ b/trunk/arch/ia64/xen/irq_xen.c @@ -138,7 +138,6 @@ static void __xen_register_percpu_irq(unsigned int cpu, unsigned int vec, struct irqaction *action, int save) { - struct irq_desc *desc; int irq = 0; if (xen_slab_ready) { @@ -223,8 +222,7 @@ __xen_register_percpu_irq(unsigned int cpu, unsigned int vec, * mark the interrupt for migrations and trigger it * on cpu hotplug. */ - desc = irq_desc + irq; - desc->status |= IRQ_PER_CPU; + irq_set_status_flags(irq, IRQ_PER_CPU); } }