From 5c3d7fd39d0818bb2936d5c7114784c0d6dee6eb Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Tue, 16 Dec 2008 09:13:11 -0800 Subject: [PATCH] --- yaml --- r: 125350 b: refs/heads/master c: c8cae544bba6aee0f5cb0756dbab1a71d2c68737 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/io_apic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ef4d29f2e25..8d5dd5cf38ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3895b01e80d120e8d19435f7cb1fa4c60c4e269 +refs/heads/master: c8cae544bba6aee0f5cb0756dbab1a71d2c68737 diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c index d7f0993b8056..3d7d0d55253f 100644 --- a/trunk/arch/x86/kernel/io_apic.c +++ b/trunk/arch/x86/kernel/io_apic.c @@ -2292,7 +2292,7 @@ static void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc, return; } - migrate_ioapic_irq_desc(desc, mask); + migrate_ioapic_irq_desc(desc, *mask); } static void set_ir_ioapic_affinity_irq(unsigned int irq, const struct cpumask *mask) @@ -3203,7 +3203,7 @@ static void ir_set_msi_irq_affinity(unsigned int irq, if (assign_irq_vector(irq, cfg, *mask)) return; - set_extra_move_desc(desc, mask); + set_extra_move_desc(desc, *mask); cpumask_and(&tmp, &cfg->domain, mask); dest = cpu_mask_to_apicid(tmp);