projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f74d165
)
bump to 2.6.29.6 and refresh patches
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 5 Jul 2009 15:08:56 +0000
(15:08 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sun, 5 Jul 2009 15:08:56 +0000
(15:08 +0000)
SVN-Revision: 16698
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/023-mips_delay_gcc4.4.0.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/024-mips_disable_fpu.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/202-mips-freestanding.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index ab8c2d41ff74e0dcdcc01b6a784b1d6e21a95856..6cf44756f47ba9031b9789ec4936de0255e6924a 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-25,8
+25,8
@@
endif
ifeq ($(LINUX_VERSION),2.6.28.10)
LINUX_KERNEL_MD5SUM:=c4efb2c494d749cb5de274f8ae41c3fa
endif
ifeq ($(LINUX_VERSION),2.6.28.10)
LINUX_KERNEL_MD5SUM:=c4efb2c494d749cb5de274f8ae41c3fa
endif
-ifeq ($(LINUX_VERSION),2.6.29.
2
)
- LINUX_KERNEL_MD5SUM:=
a6839571a9e70baf821d2fb752f9c4c6
+ifeq ($(LINUX_VERSION),2.6.29.
6
)
+ LINUX_KERNEL_MD5SUM:=
7cd24826fd3c7b0f83d9f662731a7865
endif
ifeq ($(LINUX_VERSION),2.6.30.1)
LINUX_KERNEL_MD5SUM:=7da2e2e31f1c00f2673d2dc50de76b33
endif
ifeq ($(LINUX_VERSION),2.6.30.1)
LINUX_KERNEL_MD5SUM:=7da2e2e31f1c00f2673d2dc50de76b33
diff --git
a/target/linux/generic-2.6/patches-2.6.29/023-mips_delay_gcc4.4.0.patch
b/target/linux/generic-2.6/patches-2.6.29/023-mips_delay_gcc4.4.0.patch
index ed95bcdc1cf7f505bdb0e8de212d9770a0944ff8..fcfa792806698b7fef574c80a25d403e367b9fa0 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/023-mips_delay_gcc4.4.0.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/023-mips_delay_gcc4.4.0.patch
@@
-21,11
+21,9
@@
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
arch/mips/include/asm/delay.h | 58 +++++++++++++++++++++++++------------
3 files changed, 57 insertions(+), 20 deletions(-)
arch/mips/include/asm/delay.h | 58 +++++++++++++++++++++++++------------
3 files changed, 57 insertions(+), 20 deletions(-)
-diff --git a/arch/mips/Makefile b/arch/mips/Makefile
-index a25c2e5..1ee5504 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -1
20,7 +120,14 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap
+@@ -1
19,7 +119,14 @@ cflags-$(CONFIG_CPU_R4300) += -march=r43
cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
@@
-41,8
+39,6
@@
index a25c2e5..1ee5504 100644
cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-Wa,-mips32 -Wa,--trap
cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-Wa,-mips32 -Wa,--trap
cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h
-index 71f5c5c..95256a8 100644
--- a/arch/mips/include/asm/compiler.h
+++ b/arch/mips/include/asm/compiler.h
@@ -1,5 +1,6 @@
--- a/arch/mips/include/asm/compiler.h
+++ b/arch/mips/include/asm/compiler.h
@@ -1,5 +1,6 @@
@@
-66,8
+62,6
@@
index 71f5c5c..95256a8 100644
+#endif
+
#endif /* _ASM_COMPILER_H */
+#endif
+
#endif /* _ASM_COMPILER_H */
-diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h
-index b0bccd2..00d7969 100644
--- a/arch/mips/include/asm/delay.h
+++ b/arch/mips/include/asm/delay.h
@@ -7,6 +7,7 @@
--- a/arch/mips/include/asm/delay.h
+++ b/arch/mips/include/asm/delay.h
@@ -7,6 +7,7 @@
@@
-78,7
+72,7
@@
index b0bccd2..00d7969 100644
*/
#ifndef _ASM_DELAY_H
#define _ASM_DELAY_H
*/
#ifndef _ASM_DELAY_H
#define _ASM_DELAY_H
-@@ -48,6 +49,43 @@ static inline void __delay(unsigned long
loops)
+@@ -48,6 +49,43 @@ static inline void __delay(unsigned long
: "0" (loops), "r" (1));
}
: "0" (loops), "r" (1));
}
@@
-122,7
+116,7
@@
index b0bccd2..00d7969 100644
/*
* Division by multiplication: you don't have to worry about
/*
* Division by multiplication: you don't have to worry about
-@@ -62,8 +100,6 @@ static inline void __delay(unsigned long
loops)
+@@ -62,8 +100,6 @@ static inline void __delay(unsigned long
static inline void __udelay(unsigned long usecs, unsigned long lpj)
{
static inline void __udelay(unsigned long usecs, unsigned long lpj)
{
@@
-131,7
+125,7
@@
index b0bccd2..00d7969 100644
/*
* The rates of 128 is rounded wrongly by the catchall case
* for 64-bit. Excessive precission? Probably ...
/*
* The rates of 128 is rounded wrongly by the catchall case
* for 64-bit. Excessive precission? Probably ...
-@@ -77,23 +113,7 @@ static inline void __udelay(unsigned lon
g usecs, unsigned long lpj)
+@@ -77,23 +113,7 @@ static inline void __udelay(unsigned lon
0x80000000ULL) >> 32);
#endif
0x80000000ULL) >> 32);
#endif
@@
-156,8
+150,3
@@
index b0bccd2..00d7969 100644
}
#define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val
}
#define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val
---
-1.6.0.4
-
-
-
diff --git
a/target/linux/generic-2.6/patches-2.6.29/024-mips_disable_fpu.patch
b/target/linux/generic-2.6/patches-2.6.29/024-mips_disable_fpu.patch
index e71bf48f2103b03b11699765caa8d34948aa7248..1ab570188d8a5117386b2df91c9e16bda8fa3c85 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/024-mips_disable_fpu.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/024-mips_disable_fpu.patch
@@
-6,11
+6,9
@@
precious blocks on an embedded system.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 65d3b19..a467ee5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -
811,6 +811
,17 @@ config I8259
+@@ -
798,6 +798
,17 @@ config I8259
config MIPS_BONITO64
bool
config MIPS_BONITO64
bool
@@
-28,8
+26,6
@@
index 65d3b19..a467ee5 100644
config MIPS_MSC
bool
config MIPS_MSC
bool
-diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
-index d547efd..7fdef24 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,14 @@
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -2,12 +2,14 @@
@@
-49,8
+45,6
@@
index d547efd..7fdef24 100644
+ dp_sqrt.o sp_sqrt.o
EXTRA_CFLAGS += -Werror
+ dp_sqrt.o sp_sqrt.o
EXTRA_CFLAGS += -Werror
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 890f779..9f4c767 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -56,6 +56,12 @@
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -56,6 +56,12 @@
@@
-77,7
+71,7
@@
index 890f779..9f4c767 100644
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
-@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
egs *xcp, struct mips_fpu_struct *ctx,
+@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig;
}
return sig;
}
@@
-91,11
+85,9
@@
index 890f779..9f4c767 100644
#ifdef CONFIG_DEBUG_FS
extern struct dentry *mips_debugfs_dir;
#ifdef CONFIG_DEBUG_FS
extern struct dentry *mips_debugfs_dir;
-diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
-index df7b9d9..9b42bfd 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
-@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
ps_instruction ir, unsigned long cpc)
+@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mi
return SIGILL; /* force out of emulation loop */
}
return SIGILL; /* force out of emulation loop */
}
@@
-113,8
+105,6
@@
index df7b9d9..9b42bfd 100644
+ return 0;
+}
+#endif /* CONFIG_MIPS_FPU_EMU */
+ return 0;
+}
+#endif /* CONFIG_MIPS_FPU_EMU */
-diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
-index 52e6c58..211a399 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -29,6 +29,7 @@
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -29,6 +29,7 @@
@@
-125,7
+115,7
@@
index 52e6c58..211a399 100644
void fpu_emulator_init_fpu(void)
{
static int first = 1;
void fpu_emulator_init_fpu(void)
{
static int first = 1;
-@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struc
t sigcontext32 __user *sc)
+@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struc
return err;
}
return err;
}
diff --git
a/target/linux/generic-2.6/patches-2.6.29/202-mips-freestanding.patch
b/target/linux/generic-2.6/patches-2.6.29/202-mips-freestanding.patch
index 739e972f7110d4317d96658dad36740a650f8ba2..f7749145e4799272c9ae98a5c6cff4cdd33e3b10 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/202-mips-freestanding.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/202-mips-freestanding.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -60
2,6 +602
,9 @@ else
+@@ -60
9,6 +609
,9 @@ else
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
endif
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
endif
diff --git
a/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
b/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
index 7f46c0b51aff8eafa3a79378ee346a30e071a31f..305741dc333446b8e4e9efb7f2f0da3503f52875 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
-@@ -18
90,7 +1890
,7 @@ static const struct rtl_cfg_info {
+@@ -18
89,7 +1889
,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
@@
-9,7
+9,7
@@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_GMII
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_GMII
-@@ -189
9,7 +1899
,7 @@ static const struct rtl_cfg_info {
+@@ -189
8,7 +1898
,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
@@
-18,7
+18,7
@@
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
-@@ -190
8,7 +1908
,7 @@ static const struct rtl_cfg_info {
+@@ -190
7,7 +1907
,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
@@
-27,16
+27,16
@@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_MSI
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_MSI
-@@ -35
82,10 +3582
,12 @@ static irqreturn_t rtl8169_interrupt(int
-
goto out
;
- }
+@@ -35
76,10 +3576
,12 @@ static irqreturn_t rtl8169_interrupt(int
+
break
;
+
}
+#if 0
+#if 0
- if (unlikely(status & SYSErr)) {
- rtl8169_pcierr_interrupt(dev);
-
goto out
;
- }
+
if (unlikely(status & SYSErr)) {
+
rtl8169_pcierr_interrupt(dev);
+
break
;
+
}
+#endif
+#endif
- if (status & LinkChg)
- rtl8169_check_link_status(dev, tp, ioaddr);
+
if (status & LinkChg)
+
rtl8169_check_link_status(dev, tp, ioaddr);
diff --git
a/target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch
b/target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch
index 042546f317e8a95b82e98d1e50fa8936a360fb41..87e50999276cfc0a92b7b16af00d0c8bd2b40935 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
-@@ -8
63,7 +863
,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -8
12,7 +812
,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end;
goto end;
@@
-9,7
+9,7
@@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -8
71,7 +871
,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -8
20,7 +820
,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */
}
/* Reserve space for headers. */
diff --git
a/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
b/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
index 6b8ff1dfdbae988e33f1ecff8f54ea36cdd30928..d0f36657695480e8e1c6937002d3eccd2ae2d415 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
+++ b/
target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
@@
-17,7
+17,7
@@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -130
6,3 +1307
,5 @@ MODULE_LICENSE("GPL");
+@@ -130
7,3 +1308
,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");