diff options
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic.c | 2 | ||||
-rw-r--r-- | kernel/irq/numa_migrate.c | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 60a008857a38..5c243826334a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -250,7 +250,7 @@ config SPARSE_IRQ | |||
250 | 250 | ||
251 | config NUMA_MIGRATE_IRQ_DESC | 251 | config NUMA_MIGRATE_IRQ_DESC |
252 | bool "Move irq desc when changing irq smp_affinity" | 252 | bool "Move irq desc when changing irq smp_affinity" |
253 | depends on SPARSE_IRQ && SMP | 253 | depends on SPARSE_IRQ && NUMA |
254 | default n | 254 | default n |
255 | help | 255 | help |
256 | This enables moving irq_desc to cpu/node that irq will use handled. | 256 | This enables moving irq_desc to cpu/node that irq will use handled. |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index bfe1245b1a3e..a74887b416cc 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -2471,7 +2471,7 @@ static void irq_complete_move(struct irq_desc **descp) | |||
2471 | if (likely(!cfg->move_desc_pending)) | 2471 | if (likely(!cfg->move_desc_pending)) |
2472 | return; | 2472 | return; |
2473 | 2473 | ||
2474 | /* domain is not change, but affinity is changed */ | 2474 | /* domain has not changed, but affinity did */ |
2475 | me = smp_processor_id(); | 2475 | me = smp_processor_id(); |
2476 | if (cpu_isset(me, desc->affinity)) { | 2476 | if (cpu_isset(me, desc->affinity)) { |
2477 | *descp = desc = move_irq_desc(desc, me); | 2477 | *descp = desc = move_irq_desc(desc, me); |
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c index 0178e2296990..089c3746358a 100644 --- a/kernel/irq/numa_migrate.c +++ b/kernel/irq/numa_migrate.c | |||
@@ -1,13 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * linux/kernel/irq/handle.c | 2 | * NUMA irq-desc migration code |
3 | * | ||
4 | * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar | ||
5 | * Copyright (C) 2005-2006, Thomas Gleixner, Russell King | ||
6 | * | ||
7 | * This file contains the core interrupt handling code. | ||
8 | * | ||
9 | * Detailed information is available in Documentation/DocBook/genericirq | ||
10 | * | 3 | * |
4 | * Migrate IRQ data structures (irq_desc, chip_data, etc.) over to | ||
5 | * the new "home node" of the IRQ. | ||
11 | */ | 6 | */ |
12 | 7 | ||
13 | #include <linux/irq.h> | 8 | #include <linux/irq.h> |