[kernel] r5149 - in dists/trunk/linux-2.6/debian/patches-debian: . series

[Sven Luther]

Author: luther
Date: Fri Dec 30 10:40:11 2005
New Revision: 5149

Added:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-spinlock-fix-support.patch
Removed:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch
Modified:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-build-links.patch
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1
Log:
Cleaned up more powerpc patches. Added powerpc/pegasos/marvell/gigabit ethernet spinlock fix.


Modified: dists/trunk/linux-2.6/debian/patches-debian/powerpc-build-links.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/powerpc-build-links.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-build-links.patch	Fri Dec 30 10:40:11 2005
@@ -10,15 +10,3 @@
  
  # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
  # to stdout and these checks are run even on install targets.
-diff -urN ../orig/linux-2.6-2.6.13+2.6.14-rc5/arch/ppc64/Makefile linux-2.6-2.6.13+2.6.14-rc5/arch/ppc64/Makefile
---- ../orig/linux-2.6-2.6.13+2.6.14-rc5/arch/ppc64/Makefile	2005-10-22 18:17:48.000000000 +0000
-+++ linux-2.6-2.6.13+2.6.14-rc5/arch/ppc64/Makefile	2005-10-23 13:28:34.000000000 +0000
-@@ -123,7 +123,7 @@
- include/asm: arch/$(ARCH)/include/asm
- arch/$(ARCH)/include/asm:
- 	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
--	$(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
-+	$(Q)ln -fsn $(if $(KBUILD_SRC),$(KBUILD_SRC),../../..)/include/asm-powerpc arch/$(ARCH)/include/asm
- 
- define archhelp
-   echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'

Added: dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-spinlock-fix-support.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-mv643xx-spinlock-fix-support.patch	Fri Dec 30 10:40:11 2005
@@ -0,0 +1,66 @@
+Date: Wed, 28 Dec 2005 15:40:01 -0700
+To: netdev at vger.kernel.org
+Subject: [PATCH 4/4] mv643xx: Don't call request_irq with a held lock
+Message-ID: <20051228224001.GD5742 at xyzzy.farnsworth.org>
+References: <20051228223449.GA5742 at xyzzy.farnsworth.org>
+
+From: Dale Farnsworth <dale at farnsworth.org>
+
+We can't call request_irq() while holding a spin lock.
+
+Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
+
+Index: linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
+===================================================================
+--- linux-2.6-mv643xx_enet.orig/drivers/net/mv643xx_eth.c
++++ linux-2.6-mv643xx_enet/drivers/net/mv643xx_eth.c
+@@ -655,34 +655,24 @@ static int mv643xx_eth_open(struct net_d
+ 	unsigned int port_num = mp->port_num;
+ 	int err;
+ 
+-	spin_lock_irq(&mp->lock);
+-
+ 	err = request_irq(dev->irq, mv643xx_eth_int_handler,
+ 			SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
+-
+ 	if (err) {
+ 		printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
+ 								port_num);
+-		err = -EAGAIN;
+-		goto out;
++		return -EAGAIN;
+ 	}
+ 
++	spin_lock_irq(&mp->lock);
++
+ 	if (mv643xx_eth_real_open(dev)) {
+ 		printk("%s: Error opening interface\n", dev->name);
++		free_irq(dev->irq, dev);
+ 		err = -EBUSY;
+-		goto out_free;
+ 	}
+ 
+ 	spin_unlock_irq(&mp->lock);
+ 
+-	return 0;
+-
+-out_free:
+-	free_irq(dev->irq, dev);
+-
+-out:
+-	spin_unlock_irq(&mp->lock);
+-
+ 	return err;
+ }
+ 
+
+_______________________________________________
+Linuxppc-dev mailing list
+Linuxppc-dev at ozlabs.org
+https://ozlabs.org/mailman/listinfo/linuxppc-dev
+---------------------------------------------------------------------------------------
+Wanadoo vous informe que cet  e-mail a ete controle par l'anti-virus mail. 
+Aucun virus connu a ce jour par nos services n'a ete detecte.
+
+
+

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1	Fri Dec 30 10:40:11 2005
@@ -10,10 +10,9 @@
 + sparc64-hme-lockup.patch
 #+ tty-locking-fixes9.patch
 + version.patch
-#+ powerpc-mv643xx-hotplug-support.patch
 + powerpc-apus.patch
 #+ s390-uaccess-const.patch
-#+ powerpc-build-links.patch
++ powerpc-build-links.patch
 #+ powerpc64-audit_sysctl-build.patch
 + m68k-bvme.patch
 + m68k-mvme147.patch
@@ -22,3 +21,5 @@
 + sparc64-atyfb-xl-gr-final.patch
 + powerpc-arch-default-powerpc.patch
 + drivers-scsi-megaraid_splitup.patch
++ powerpc-mv643xx-spinlock-fix-support.patch
+