Author: sparky Date: Fri Mar 10 14:35:53 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- kill EXTRAVERSION change
- most skge.c changes already in kernel
---- Files affected:
SOURCES:
kernel-preempt-rt.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-preempt-rt.patch
diff -u SOURCES/kernel-preempt-rt.patch:1.1.2.1
SOURCES/kernel-preempt-rt.patch:1.1.2.2
--- SOURCES/kernel-preempt-rt.patch:1.1.2.1 Fri Mar 10 15:20:05 2006
+++ SOURCES/kernel-preempt-rt.patch Fri Mar 10 15:35:48 2006
@@ -1386,15 +1386,6 @@
===================================================================
--- linux.prev.orig/Makefile
+++ linux.prev/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 15
--EXTRAVERSION =
-+EXTRAVERSION =-rt21
- NAME=Sliding Snow Leopard
-
- # *DOCUMENTATION*
@@ -519,10 +519,14 @@ CFLAGS += $(call add-align,CONFIG_CC_AL
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
@@ -22468,45 +22459,6 @@
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
if (!netif_queue_stopped(dev)) {
-@@ -2823,10 +2820,10 @@ static void skge_extirq(unsigned long da
- }
- spin_unlock(&hw->phy_lock);
-
-- local_irq_disable();
-+ spin_lock_irq(&hw->hw_lock);
- hw->intr_mask |= IS_EXT_REG;
- skge_write32(hw, B0_IMSK, hw->intr_mask);
-- local_irq_enable();
-+ spin_unlock_irq(&hw->hw_lock);
- }
-
- static inline void skge_wakeup(struct net_device *dev)
-@@ -2845,6 +2842,8 @@ static irqreturn_t skge_intr(int irq, vo
- if (status == 0 || status == ~0) /* hotplug or shared irq */
- return IRQ_NONE;
-
-+ spin_lock(&hw->hw_lock);
-+
- status &= hw->intr_mask;
- if (status & IS_R1_F) {
- hw->intr_mask &= ~IS_R1_F;
-@@ -2896,6 +2895,8 @@ static irqreturn_t skge_intr(int irq, vo
-
- skge_write32(hw, B0_IMSK, hw->intr_mask);
-
-+ spin_unlock(&hw->hw_lock);
-+
- return IRQ_HANDLED;
- }
-
-@@ -3252,6 +3253,7 @@ static int __devinit skge_probe(struct p
- }
-
- hw->pdev = pdev;
-+ spin_lock_init(&hw->hw_lock);
- spin_lock_init(&hw->phy_lock);
- tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw);
-
Index: linux.prev/drivers/net/skge.h
===================================================================
--- linux.prev.orig/drivers/net/skge.h
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-preempt-rt.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
