rpms/kernel/devel linux-2.6-compile-fixes.patch,1.140,1.141

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24539

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 b/arch/i386/kernel/io_apic.c                            |    2 --
 b/arch/x86_64/kernel/io_apic.c                          |    5 -----
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c      |    4 ++++
 linux-2.6.20.noarch/drivers/net/mv643xx_eth.h           |    2 +-
 linux-2.6.20.noarch/drivers/video/nvidia/nv_backlight.c |    3 +++
 5 files changed, 8 insertions(+), 8 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- linux-2.6-compile-fixes.patch	28 Feb 2007 20:08:52 -0000	1.140
+++ linux-2.6-compile-fixes.patch	28 Feb 2007 20:36:07 -0000	1.141
@@ -78,3 +78,78 @@
  
  #define ETH_RX_QUEUES_ENABLED	(1 << 0)	/* use only Q0 for receive */
  #define ETH_TX_QUEUES_ENABLED	(1 << 0)	/* use only Q0 for transmit */
+
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2ff7354fe888f46f6629b57e463b0a1eb956c02b
+Commit:     2ff7354fe888f46f6629b57e463b0a1eb956c02b
+Parent:     606135a3081e045b677cde164a296c51f66c4633
+Author:     Eric W. Biederman <ebiederm at xmission.com>
+AuthorDate: Tue Feb 27 00:27:41 2007 -0700
+Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
+CommitDate: Wed Feb 28 08:52:31 2007 -0800
+
+    [PATCH] x86_64/i386 irq: Fix !CONFIG_SMP compilation
+    
+    When removing set_native_irq I missed the fact that it was
+    called in a couple of places that were compiled even when
+    SMP support is disabled.  And since the irq_desc[].affinity
+    field only exists in SMP things broke.
+    
+    Thanks to Simon Arlott <simon at arlott.org> for spotting this.
+    
+    There are a couple of ways to fix this but the simplest one
+    is to just remove the assignments.  The affinity field is only
+    used to display a value to the user, and nothing on either i386
+    or x86_64 reads it or depends on it being any particlua value,
+    so skipping the assignment is safe.  The assignment that
+    is being removed is just for the initial affinity value before
+    the user explicitly sets it.  The irq_desc array initializes
+    this field to CPU_MASK_ALL so the field is initialized to
+    a reasonable value in the SMP case without being set.
+    
+    Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ arch/i386/kernel/io_apic.c   |    2 --
+ arch/x86_64/kernel/io_apic.c |    4 ----
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
+index 6fec4da..e4408ff 100644
+--- a/arch/i386/kernel/io_apic.c
++++ b/arch/i386/kernel/io_apic.c
+@@ -1354,7 +1354,6 @@ static void __init setup_IO_APIC_irqs(void)
+ 		}
+ 		spin_lock_irqsave(&ioapic_lock, flags);
+ 		__ioapic_write_entry(apic, pin, entry);
+-		irq_desc[irq].affinity = TARGET_CPUS;
+ 		spin_unlock_irqrestore(&ioapic_lock, flags);
+ 	}
+ 	}
+@@ -2875,7 +2874,6 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
+ 
+ 	spin_lock_irqsave(&ioapic_lock, flags);
+ 	__ioapic_write_entry(ioapic, pin, entry);
+-	irq_desc[irq].affinity = TARGET_CPUS;
+ 	spin_unlock_irqrestore(&ioapic_lock, flags);
+ 
+ 	return 0;
+diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
+index 48593f6..0a91368 100644
+--- a/arch/x86_64/kernel/io_apic.c
++++ b/arch/x86_64/kernel/io_apic.c
+@@ -830,10 +830,6 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,
+ 		disable_8259A_irq(irq);
+ 
+ 	ioapic_write_entry(apic, pin, entry);
+-
+-	spin_lock_irqsave(&ioapic_lock, flags);
+-	irq_desc[irq].affinity = TARGET_CPUS;
+-	spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+ 
+ static void __init setup_IO_APIC_irqs(void)
+-
+To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+