Browse Source

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/irq: Fix move_irq_desc() for nodes without ram
Linus Torvalds 15 years ago
parent
commit
cec36911b5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      kernel/irq/numa_migrate.c

+ 2 - 2
kernel/irq/numa_migrate.c

@@ -107,8 +107,8 @@ out_unlock:
 
 
 struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
 struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
 {
 {
-	/* those all static, do move them */
-	if (desc->irq < NR_IRQS_LEGACY)
+	/* those static or target node is -1, do not move them */
+	if (desc->irq < NR_IRQS_LEGACY || node == -1)
 		return desc;
 		return desc;
 
 
 	if (desc->node != node)
 	if (desc->node != node)