aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-08 16:21:26 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 10:53:39 -0400
commit0e09ddf2d71aeff92ff8055ac7600b85c255ee85 (patch)
tree8cd5e694886eea4477f92028aec368f5020e5d0d /arch/x86
parentfe52b2d25919eaa01c51651a664f4f2ba6bd2a11 (diff)
x86: Cleanup hpet affinity setting
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic/io_apic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 6f8ac4c542ba..0b9ec3cb311f 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3545,12 +3545,11 @@ int arch_setup_dmar_msi(unsigned int irq)
3545static int hpet_msi_set_affinity(struct irq_data *data, 3545static int hpet_msi_set_affinity(struct irq_data *data,
3546 const struct cpumask *mask, bool force) 3546 const struct cpumask *mask, bool force)
3547{ 3547{
3548 struct irq_desc *desc = irq_to_desc(data->irq);
3549 struct irq_cfg *cfg = data->chip_data; 3548 struct irq_cfg *cfg = data->chip_data;
3550 struct msi_msg msg; 3549 struct msi_msg msg;
3551 unsigned int dest; 3550 unsigned int dest;
3552 3551
3553 if (__ioapic_set_affinity(&desc->irq_data, mask, &dest)) 3552 if (__ioapic_set_affinity(data, mask, &dest))
3554 return -1; 3553 return -1;
3555 3554
3556 hpet_msi_read(data->handler_data, &msg); 3555 hpet_msi_read(data->handler_data, &msg);