Branch b1_6

b=13380
r=adilger, johann

fix a potential deadlock condition in netpoll code of the sles9 kernel

lustre/kernel_patches/patches/netpoll_xmit_lock-2.6-suse.patch

+--- linux-2.6.orig/net/core/netpoll.c	2007-12-18 21:58:41.000000000 +0800
++++ linux-2.6/net/core/netpoll.c	2007-12-18 21:59:01.000000000 +0800
+@@ -160,6 +160,11 @@ repeat:
+ 		return;
+ 	}
+ 
++        if(np->dev->xmit_lock_owner == smp_processor_id()) {
++		__kfree_skb(skb);
++		return;
++	}
++
+ 	spin_lock(&np->dev->xmit_lock);
+ 	np->dev->xmit_lock_owner = smp_processor_id();
+ 

lustre/kernel_patches/series/2.6-suse-newer.series

@@ -14,3 +14,4 @@ bitops_ext2_find_next_le_bit-2.6.patch
 vfs_intent-reduce-stack-usage-2.6-suse-newer.patch
 atomic_add_return-sles9.patch
 modpost_external_module_updates_sles9.patch
+netpoll_xmit_lock-2.6-suse.patch