Messages in this thread Patch in this message | | | Date | Wed, 29 Apr 2009 09:27:31 -0700 | From | Yinghai Lu <> | Subject | [PATCH] x86/irq: using move_irq_desc |
| |
move_irq_desc will try to move irq_desc to node wanted if allocated one is not correct. (happen on device on different nodes that are using MSI, drivers are loaded and unloaded randomly)
[ Impact: make irq_desc go with device on node ]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
--- arch/x86/kernel/apic/io_apic.c | 6 +----- include/linux/irq.h | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6/arch/x86/kernel/apic/io_apic.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +++ linux-2.6/arch/x86/kernel/apic/io_apic.c @@ -3155,11 +3155,7 @@ unsigned int create_irq_nr(unsigned int if (cfg_new->vector != 0) continue; -#ifdef CONFIG_NUMA_IRQ_DESC - /* different node ?*/ - if (desc_new->node != node) - desc = move_irq_desc(desc, node); -#endif + desc_new = move_irq_desc(desc_new, node); if (__assign_irq_vector(new, cfg_new, apic->target_cpus()) == 0) irq = new; Index: linux-2.6/include/linux/irq.h =================================================================== --- linux-2.6.orig/include/linux/irq.h +++ linux-2.6/include/linux/irq.h @@ -206,6 +206,10 @@ extern void arch_free_chip_data(struct i #ifndef CONFIG_SPARSE_IRQ extern struct irq_desc irq_desc[NR_IRQS]; +static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) +{ + return desc; +} #else /* CONFIG_SPARSE_IRQ */ extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int node); #endif /* CONFIG_SPARSE_IRQ */
| |