--- /dev/null
+From nobody Mon Sep 17 00:00:00 2001
+Date: Wed, 30 Nov 2005 03:34:42 +0000 (-0800)
+Subject: [PATCH] setting irq affinity is broken in ia32 with MSI enabled
+From: Shaohua Li <shaohua.li@intel.com>
+
+Setting irq affinity stops working when MSI is enabled. With MSI, move_irq
+is empty, so we can't change irq affinity. It appears a typo in Ashok's
+original commit for this issue. X86_64 actually is using move_native_irq.
+
+Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ arch/i386/kernel/io_apic.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.14.6.orig/arch/i386/kernel/io_apic.c
++++ linux-2.6.14.6/arch/i386/kernel/io_apic.c
+@@ -1937,7 +1937,7 @@ static void ack_edge_ioapic_vector(unsig
+ {
+ int irq = vector_to_irq(vector);
+
+- move_irq(vector);
++ move_native_irq(vector);
+ ack_edge_ioapic_irq(irq);
+ }
+
+@@ -1952,7 +1952,7 @@ static void end_level_ioapic_vector (uns
+ {
+ int irq = vector_to_irq(vector);
+
+- move_irq(vector);
++ move_native_irq(vector);
+ end_level_ioapic_irq(irq);
+ }
+