aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-25 15:43:34 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 08:48:04 -0400
commit33776b009a45c8e921c47ea2d8304104677ee778 (patch)
tree0eadcf05e243c1800b3eec9255c0b08395594aee
parent97499b2ed7ce80cb03e9f513f9f552f833501fbe (diff)
ia64: sn: Use irqd_mark_affinity_set() helper
irq_desc->status is going to be restricted. Provide a helper to set that information in irq_data, where it belongs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/ia64/sn/kernel/irq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 69578cf8f177..cbb4e5406310 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -353,7 +353,6 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
353 int cpu = nasid_slice_to_cpuid(nasid, slice); 353 int cpu = nasid_slice_to_cpuid(nasid, slice);
354#ifdef CONFIG_SMP 354#ifdef CONFIG_SMP
355 int cpuphys; 355 int cpuphys;
356 struct irq_desc *desc;
357#endif 356#endif
358 357
359 pci_dev_get(pci_dev); 358 pci_dev_get(pci_dev);
@@ -370,12 +369,11 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
370#ifdef CONFIG_SMP 369#ifdef CONFIG_SMP
371 cpuphys = cpu_physical_id(cpu); 370 cpuphys = cpu_physical_id(cpu);
372 set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); 371 set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);
373 desc = irq_to_desc(sn_irq_info->irq_irq);
374 /* 372 /*
375 * Affinity was set by the PROM, prevent it from 373 * Affinity was set by the PROM, prevent it from
376 * being reset by the request_irq() path. 374 * being reset by the request_irq() path.
377 */ 375 */
378 desc->status |= IRQ_AFFINITY_SET; 376 irqd_mark_affinity_was_set(irq_get_irq_data(sn_irq_info->irq_irq));
379#endif 377#endif
380} 378}
381 379