aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/kernel/io_apic.c2
2 files changed, 2 insertions, 2 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
251config NUMA_MIGRATE_IRQ_DESC 251config 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);