upgrade to 2.6.30-rc6, refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15912 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 1 insertions, 75 deletions

diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index dfc897a95..ab2c22d6f 100644
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@@ -11,7 +11,7 @@ BOARD:=sibyte
 BOARDNAME:=Broadcom/SiByte SB-1
 FEATURES:=broken
 
-LINUX_VERSION:=2.6.30-rc5
+LINUX_VERSION:=2.6.30-rc6
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/sibyte/patches/003-fix_locking.patch b/target/linux/sibyte/patches/003-fix_locking.patch
deleted file mode 100644
index eaa70f6ad..000000000
--- a/target/linux/sibyte/patches/003-fix_locking.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Locking of irq_desc is now done in irq_set_affinity; Don't lock it
-again in chip specific set_affinity function.
-
-Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
----
-
- arch/mips/sibyte/bcm1480/irq.c |    7 ++-----
- arch/mips/sibyte/sb1250/irq.c  |    7 ++-----
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
-index 352352b..c147c4b 100644
---- a/arch/mips/sibyte/bcm1480/irq.c
-+++ b/arch/mips/sibyte/bcm1480/irq.c
-@@ -113,7 +113,6 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- {
- 	int i = 0, old_cpu, cpu, int_on, k;
- 	u64 cur_ints;
--	struct irq_desc *desc = irq_desc + irq;
- 	unsigned long flags;
- 	unsigned int irq_dirty;
- 
-@@ -127,8 +126,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- 	cpu = cpu_logical_map(i);
- 
- 	/* Protect against other affinity changers and IMR manipulation */
--	spin_lock_irqsave(&desc->lock, flags);
--	spin_lock(&bcm1480_imr_lock);
-+	spin_lock_irqsave(&bcm1480_imr_lock, flags);
- 
- 	/* Swizzle each CPU's IMR (but leave the IP selection alone) */
- 	old_cpu = bcm1480_irq_owner[irq];
-@@ -153,8 +151,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
- 			____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
- 		}
- 	}
--	spin_unlock(&bcm1480_imr_lock);
--	spin_unlock_irqrestore(&desc->lock, flags);
-+	spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
- }
- #endif
- 
-diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
-index c08ff58..38cb998 100644
---- a/arch/mips/sibyte/sb1250/irq.c
-+++ b/arch/mips/sibyte/sb1250/irq.c
-@@ -107,7 +107,6 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- {
- 	int i = 0, old_cpu, cpu, int_on;
- 	u64 cur_ints;
--	struct irq_desc *desc = irq_desc + irq;
- 	unsigned long flags;
- 
- 	i = cpumask_first(mask);
-@@ -121,8 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- 	cpu = cpu_logical_map(i);
- 
- 	/* Protect against other affinity changers and IMR manipulation */
--	spin_lock_irqsave(&desc->lock, flags);
--	spin_lock(&sb1250_imr_lock);
-+	spin_lock_irqsave(&sb1250_imr_lock, flags);
- 
- 	/* Swizzle each CPU's IMR (but leave the IP selection alone) */
- 	old_cpu = sb1250_irq_owner[irq];
-@@ -144,8 +142,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
- 		____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
- 					R_IMR_INTERRUPT_MASK));
- 	}
--	spin_unlock(&sb1250_imr_lock);
--	spin_unlock_irqrestore(&desc->lock, flags);
-+	spin_unlock_irqrestore(&sb1250_imr_lock, flags);
- }
- #endif
-