SOURCES (LINUX_2_6_14): kernel-hotfixes.patch - setting irq affini...

[arekm]

Author: arekm                        Date: Sun Jan  8 18:53:43 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6_14
---- Log message:
- setting irq affinity is broken in ia32 with MSI enabled

---- Files affected:
SOURCES:
   kernel-hotfixes.patch (1.1.2.70 -> 1.1.2.70.2.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-hotfixes.patch
diff -u SOURCES/kernel-hotfixes.patch:1.1.2.70 SOURCES/kernel-hotfixes.patch:1.1.2.70.2.1
--- SOURCES/kernel-hotfixes.patch:1.1.2.70	Fri Nov 11 10:20:37 2005
+++ SOURCES/kernel-hotfixes.patch	Sun Jan  8 19:53:38 2006
@@ -140,3 +140,40 @@
  EXPORT_SYMBOL(ip_queue_xmit);
  EXPORT_SYMBOL(ip_send_check);
 +EXPORT_SYMBOL(sysctl_ip_default_ttl);
+From: Shaohua Li <shaohua.li at intel.com>
+Date: Wed, 30 Nov 2005 03:34:42 +0000 (-0800)
+Subject: [PATCH] setting irq affinity is broken in ia32 with MSI enabled
+X-Git-Tag: v2.6.15-rc4
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=fe655d3a06488c8a188461bca493e9f23fc8c448
+
+[PATCH] setting irq affinity is broken in ia32 with MSI enabled
+
+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 at intel.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+---
+
+--- a/arch/i386/kernel/io_apic.c
++++ b/arch/i386/kernel/io_apic.c
+@@ -2009,7 +2009,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);
+ }
+ 
+@@ -2024,7 +2024,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);
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-hotfixes.patch?r1=1.1.2.70&r2=1.1.2.70.2.1&f=u