From 0e09ddf2d71aeff92ff8055ac7600b85c255ee85 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 8 Oct 2010 22:21:26 +0200
Subject: [PATCH] x86: Cleanup hpet affinity setting
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/apic/io_apic.c | 3 +--
1 file changed, 1 insertion(+), 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)
static int hpet_msi_set_affinity(struct irq_data *data,
const struct cpumask *mask, bool force)
{
- struct irq_desc *desc = irq_to_desc(data->irq);
struct irq_cfg *cfg = data->chip_data;
struct msi_msg msg;
unsigned int dest;
- if (__ioapic_set_affinity(&desc->irq_data, mask, &dest))
+ if (__ioapic_set_affinity(data, mask, &dest))
return -1;
hpet_msi_read(data->handler_data, &msg);
--
GitLab