From c6cdd48009dfcb4e4eb846455becf8e845965731 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 19 Dec 2008 13:48:34 -0800
Subject: [PATCH] --- yaml --- r: 123263 b: refs/heads/master c:
 b909895739427874c089bc0e03dc119f99cab2dd h: refs/heads/master i:   123261:
 9958070ae05445b1ca3d2fd192cc5bcf2d1d3002   123259:
 64048f298ed8862ccbab4414c37e39d939b1ba8f   123255:
 74f8654c3cb5c7070528b4411f05c768ac54dbae   123247:
 900631d9f4ea166838e4f6d85da46edc0c412b3d   123231:
 d0efed44ccf7e2aa0c493e06889e1ab11c615426   123199:
 81aec45f56e4db90895e1d74c394df76c38ef98e   123135:
 a9f254880cc6403718658aa77be6262abf593b3f v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/Kconfig          |  2 +-
 trunk/arch/x86/kernel/io_apic.c |  2 +-
 trunk/kernel/irq/numa_migrate.c | 11 +++--------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1dc15455932e..4010cdc30202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 078a55db075bf4dcc03115dc94875b3dd83f69d4
+refs/heads/master: b909895739427874c089bc0e03dc119f99cab2dd
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 60a008857a38..5c243826334a 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -250,7 +250,7 @@ config SPARSE_IRQ
 
 config NUMA_MIGRATE_IRQ_DESC
 	bool "Move irq desc when changing irq smp_affinity"
-	depends on SPARSE_IRQ && SMP
+	depends on SPARSE_IRQ && NUMA
 	default n
 	help
 	  This enables moving irq_desc to cpu/node that irq will use handled.
diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/io_apic.c
index bfe1245b1a3e..a74887b416cc 100644
--- a/trunk/arch/x86/kernel/io_apic.c
+++ b/trunk/arch/x86/kernel/io_apic.c
@@ -2471,7 +2471,7 @@ static void irq_complete_move(struct irq_desc **descp)
 		if (likely(!cfg->move_desc_pending))
 			return;
 
-		/* domain is not change, but affinity is changed */
+		/* domain has not changed, but affinity did */
 		me = smp_processor_id();
 		if (cpu_isset(me, desc->affinity)) {
 			*descp = desc = move_irq_desc(desc, me);
diff --git a/trunk/kernel/irq/numa_migrate.c b/trunk/kernel/irq/numa_migrate.c
index 0178e2296990..089c3746358a 100644
--- a/trunk/kernel/irq/numa_migrate.c
+++ b/trunk/kernel/irq/numa_migrate.c
@@ -1,13 +1,8 @@
 /*
- * linux/kernel/irq/handle.c
- *
- * Copyright (C) 1992, 1998-2006 Linus Torvalds, Ingo Molnar
- * Copyright (C) 2005-2006, Thomas Gleixner, Russell King
- *
- * This file contains the core interrupt handling code.
- *
- * Detailed information is available in Documentation/DocBook/genericirq
+ * NUMA irq-desc migration code
  *
+ * Migrate IRQ data structures (irq_desc, chip_data, etc.) over to
+ * the new "home node" of the IRQ.
  */
 
 #include <linux/irq.h>