[IA64] SN: prevent IRQ retargetting in request_irq()

With the introduction of the generic affinity autoselector,
irq_select_affinity(), IRQs are now being retargetted,
using a default mask, via the request_irq() path.
This results in all IRQs targetted at CPU 0.

SN Altix assigns affinity in the SN PROM, and does not
expect that to be changed as part of request_irq().

Set the IRQ_AFFINITY_SET flag to prevent
request_irq() from resetting affinity.

Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

authored by John Keller and committed by Tony Luck ff740fb0 3c0db899

+8 -1
+8 -1
arch/ia64/sn/kernel/irq.c
··· 5 * License. See the file "COPYING" in the main directory of this archive 6 * for more details. 7 * 8 - * Copyright (c) 2000-2007 Silicon Graphics, Inc. All Rights Reserved. 9 */ 10 11 #include <linux/irq.h> ··· 375 int cpu = nasid_slice_to_cpuid(nasid, slice); 376 #ifdef CONFIG_SMP 377 int cpuphys; 378 #endif 379 380 pci_dev_get(pci_dev); ··· 392 #ifdef CONFIG_SMP 393 cpuphys = cpu_physical_id(cpu); 394 set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); 395 #endif 396 } 397
··· 5 * License. See the file "COPYING" in the main directory of this archive 6 * for more details. 7 * 8 + * Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved. 9 */ 10 11 #include <linux/irq.h> ··· 375 int cpu = nasid_slice_to_cpuid(nasid, slice); 376 #ifdef CONFIG_SMP 377 int cpuphys; 378 + irq_desc_t *desc; 379 #endif 380 381 pci_dev_get(pci_dev); ··· 391 #ifdef CONFIG_SMP 392 cpuphys = cpu_physical_id(cpu); 393 set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); 394 + desc = irq_to_desc(sn_irq_info->irq_irq); 395 + /* 396 + * Affinity was set by the PROM, prevent it from 397 + * being reset by the request_irq() path. 398 + */ 399 + desc->status |= IRQ_AFFINITY_SET; 400 #endif 401 } 402