diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-10 11:21:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-10 11:21:13 -0700 |
| commit | cec36911b5fa4ac342f6de856b12a9f71f84e6e5 (patch) | |
| tree | 329f88e132e35a9be143f7bc5562ffd12690dffe /kernel | |
| parent | a3263969b02260f8733940f580c7af1c716d38ad (diff) | |
| parent | ad7d6c7a0654a4bbda3e109f56af713267e96274 (diff) | |
| download | op-kernel-dev-cec36911b5fa4ac342f6de856b12a9f71f84e6e5.zip op-kernel-dev-cec36911b5fa4ac342f6de856b12a9f71f84e6e5.tar.gz | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/numa_migrate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c index 2f69bee..3fd3019 100644 --- a/kernel/irq/numa_migrate.c +++ b/kernel/irq/numa_migrate.c @@ -107,8 +107,8 @@ out_unlock: 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; if (desc->node != node) |
