From f2446147e56e8a91561cbcecc6aa2ba7e3224e78 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 3 Jul 2009 09:31:52 +0000 Subject: [PATCH] [kernel] update to latest 2.6.27.26 stable kernel git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16659 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-version.mk | 4 ++-- target/linux/ar7/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- ...2-add_support_for_broadcom_63xx_cpus.patch | 2 +- .../023-mips_delay_gcc4.4.0.patch | 19 ++++----------- .../patches-2.6.27/024-mips_disable_fpu.patch | 24 ++++++------------- .../202-mips-freestanding.patch | 2 +- .../patches-2.6.27/208-rtl8110sb_fix.patch | 8 +++---- .../801-usb_serial_endpoint_size.patch | 4 ++-- .../patches-2.6.27/971-ocf_20080917.patch | 2 +- .../patches-2.6.27/980-vm_exports.patch | 2 +- target/linux/olpc/Makefile | 2 +- 12 files changed, 26 insertions(+), 47 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index c2ed6de0d..f502ab346 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -19,8 +19,8 @@ endif ifeq ($(LINUX_VERSION),2.6.25.20) LINUX_KERNEL_MD5SUM:=0da698edccf03e2235abc2830a495114 endif -ifeq ($(LINUX_VERSION),2.6.27.25) - LINUX_KERNEL_MD5SUM:=5d6dcff157f30d742c9ee28ad4589779 +ifeq ($(LINUX_VERSION),2.6.27.26) + LINUX_KERNEL_MD5SUM:=6c246d71fa4698fb0dee0ed092f0282b endif ifeq ($(LINUX_VERSION),2.6.28.10) LINUX_KERNEL_MD5SUM:=c4efb2c494d749cb5de274f8ae41c3fa diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 80b772624..b6055d1f7 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -11,7 +11,7 @@ BOARD:=ar7 BOARDNAME:=TI AR7 FEATURES:=squashfs jffs2 atm -LINUX_VERSION:=2.6.27.25 +LINUX_VERSION:=2.6.27.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index c168ed6ba..200040b0b 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx FEATURES:=squashfs jffs2 usb atm pci pcmcia -LINUX_VERSION:=2.6.27.25 +LINUX_VERSION:=2.6.27.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-2.6.27/002-add_support_for_broadcom_63xx_cpus.patch b/target/linux/brcm63xx/patches-2.6.27/002-add_support_for_broadcom_63xx_cpus.patch index 90603dcf8..af494f495 100644 --- a/target/linux/brcm63xx/patches-2.6.27/002-add_support_for_broadcom_63xx_cpus.patch +++ b/target/linux/brcm63xx/patches-2.6.27/002-add_support_for_broadcom_63xx_cpus.patch @@ -88,7 +88,7 @@ Signed-off-by: Maxime Bizon source "arch/mips/pmc-sierra/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -533,6 +533,13 @@ cflags-$(CONFIG_BCM47XX) += -Iinclude/as +@@ -540,6 +540,13 @@ cflags-$(CONFIG_BCM47XX) += -Iinclude/as load-$(CONFIG_BCM47XX) := 0xffffffff80001000 # diff --git a/target/linux/generic-2.6/patches-2.6.27/023-mips_delay_gcc4.4.0.patch b/target/linux/generic-2.6/patches-2.6.27/023-mips_delay_gcc4.4.0.patch index f001b81e1..4f7f32788 100644 --- a/target/linux/generic-2.6/patches-2.6.27/023-mips_delay_gcc4.4.0.patch +++ b/target/linux/generic-2.6/patches-2.6.27/023-mips_delay_gcc4.4.0.patch @@ -21,11 +21,9 @@ Signed-off-by: Wu Zhangjin 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 -@@ -120,7 +120,14 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap +@@ -119,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 @@ -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) \ -diff --git a/include/asm-mips/compiler.h b/include/asm-mips/compiler.h -index 71f5c5c..95256a8 100644 --- a/include/asm-mips/compiler.h +++ b/include/asm-mips/compiler.h @@ -1,5 +1,6 @@ @@ -66,8 +62,6 @@ index 71f5c5c..95256a8 100644 +#endif + #endif /* _ASM_COMPILER_H */ -diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h -index b0bccd2..00d7969 100644 --- a/include/asm-mips/delay.h +++ b/include/asm-mips/delay.h @@ -7,6 +7,7 @@ @@ -78,7 +72,7 @@ index b0bccd2..00d7969 100644 */ #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)); } @@ -122,7 +116,7 @@ index b0bccd2..00d7969 100644 /* * 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) { @@ -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 ... -@@ -77,23 +113,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) +@@ -77,23 +113,7 @@ static inline void __udelay(unsigned lon 0x80000000ULL) >> 32); #endif @@ -156,8 +150,3 @@ index b0bccd2..00d7969 100644 } #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.27/024-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.27/024-mips_disable_fpu.patch index e71bf48f2..60e844b27 100644 --- a/target/linux/generic-2.6/patches-2.6.27/024-mips_disable_fpu.patch +++ b/target/linux/generic-2.6/patches-2.6.27/024-mips_disable_fpu.patch @@ -6,11 +6,9 @@ precious blocks on an embedded system. Signed-off-by: Florian Fainelli -- -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 65d3b19..a467ee5 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -811,6 +811,17 @@ config I8259 +@@ -756,6 +756,17 @@ config I8259 config MIPS_BONITO64 bool @@ -28,8 +26,6 @@ index 65d3b19..a467ee5 100644 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 @@ @@ -49,11 +45,9 @@ index d547efd..7fdef24 100644 + 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 @@ +@@ -57,6 +57,12 @@ #endif #define __mips 4 @@ -66,7 +60,7 @@ index 890f779..9f4c767 100644 /* Function which emulates a floating point instruction. */ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *, -@@ -66,10 +72,6 @@ static int fpux_emu(struct pt_regs *, +@@ -67,10 +73,6 @@ static int fpux_emu(struct pt_regs *, struct mips_fpu_struct *, mips_instruction); #endif @@ -77,7 +71,7 @@ index 890f779..9f4c767 100644 /* Control registers */ #define FPCREG_RID 0 /* $0 = revision id */ -@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx, +@@ -1277,6 +1279,13 @@ int fpu_emulator_cop1Handler(struct pt_r return sig; } @@ -91,11 +85,9 @@ index 890f779..9f4c767 100644 #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 -@@ -109,6 +109,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc) +@@ -110,6 +110,7 @@ int mips_dsemul(struct pt_regs *regs, mi return SIGILL; /* force out of emulation loop */ } @@ -103,7 +95,7 @@ index df7b9d9..9b42bfd 100644 int do_dsemulret(struct pt_regs *xcp) { struct emuframe __user *fr; -@@ -165,3 +166,9 @@ int do_dsemulret(struct pt_regs *xcp) +@@ -166,3 +167,9 @@ int do_dsemulret(struct pt_regs *xcp) return 1; } @@ -113,8 +105,6 @@ index df7b9d9..9b42bfd 100644 + 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 @@ @@ -125,7 +115,7 @@ index 52e6c58..211a399 100644 void fpu_emulator_init_fpu(void) { static int first = 1; -@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struct sigcontext32 __user *sc) +@@ -112,4 +113,34 @@ int fpu_emulator_restore_context32(struc return err; } diff --git a/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch index 156510b02..a26d3f2e0 100644 --- a/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch +++ b/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -577,6 +577,9 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ +@@ -584,6 +584,9 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ # core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ diff --git a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch index 4d8dfeb55..e89f81754 100644 --- a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c -@@ -1527,7 +1527,7 @@ static const struct rtl_cfg_info { +@@ -1526,7 +1526,7 @@ static const struct rtl_cfg_info { .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 -@@ -1536,7 +1536,7 @@ static const struct rtl_cfg_info { +@@ -1535,7 +1535,7 @@ static const struct rtl_cfg_info { .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 -@@ -1545,7 +1545,7 @@ static const struct rtl_cfg_info { +@@ -1544,7 +1544,7 @@ static const struct rtl_cfg_info { .hw_start = rtl_hw_start_8101, .region = 2, .align = 8, @@ -27,7 +27,7 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_MSI -@@ -2879,10 +2879,12 @@ static irqreturn_t rtl8169_interrupt(int +@@ -2878,10 +2878,12 @@ static irqreturn_t rtl8169_interrupt(int goto out; } diff --git a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch index e96e01cd5..78681d2b4 100644 --- a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch @@ -8,7 +8,7 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -835,7 +836,7 @@ int usb_serial_probe(struct usb_interfac +@@ -856,7 +857,7 @@ int usb_serial_probe(struct usb_interfac dev_err(&interface->dev, "No free urbs available\n"); goto probe_error; } @@ -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); -@@ -1255,3 +1256,5 @@ MODULE_LICENSE("GPL"); +@@ -1292,3 +1293,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic-2.6/patches-2.6.27/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.27/971-ocf_20080917.patch index ebed01db8..3a84e6e4d 100644 --- a/target/linux/generic-2.6/patches-2.6.27/971-ocf_20080917.patch +++ b/target/linux/generic-2.6/patches-2.6.27/971-ocf_20080917.patch @@ -88,7 +88,7 @@ /********************************************************************* --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -140,6 +140,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde +@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde } return ret; } diff --git a/target/linux/generic-2.6/patches-2.6.27/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.27/980-vm_exports.patch index 35126ee8f..58c6289e4 100644 --- a/target/linux/generic-2.6/patches-2.6.27/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.27/980-vm_exports.patch @@ -86,7 +86,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -2241,6 +2242,7 @@ int vmtruncate_range(struct inode *inode +@@ -2287,6 +2288,7 @@ int vmtruncate_range(struct inode *inode return 0; } diff --git a/target/linux/olpc/Makefile b/target/linux/olpc/Makefile index c7d542e89..c1e2da146 100644 --- a/target/linux/olpc/Makefile +++ b/target/linux/olpc/Makefile @@ -11,7 +11,7 @@ BOARD:=olpc BOARDNAME:=OLPC XO-1 FEATURES:=squashfs ext2 -LINUX_VERSION:=2.6.27.25 +LINUX_VERSION:=2.6.27.26 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci -- 2.20.1