From ead8ab8403bfbc0fa588c6590e85c18141fa74a2 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 24 Nov 2010 18:50:11 +0000 Subject: [PATCH] update to the latest stable kernels SVN-Revision: 24136 --- include/kernel-version.mk | 12 ++++++------ target/linux/adm5120/Makefile | 2 +- target/linux/adm8668/Makefile | 2 +- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- target/linux/at91/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/au1000/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- target/linux/cobalt/Makefile | 2 +- target/linux/ep93xx/Makefile | 2 +- target/linux/etrax/Makefile | 2 +- target/linux/gemini/Makefile | 2 +- .../patches-2.6.32/040-use_ext4_for_ext23.patch | 6 +++--- .../041-ext4_do_not_override_ext23.patch | 4 ++-- .../042-ext4_add_ext23_module_aliases.patch | 4 ++-- .../generic/patches-2.6.32/980-vm_exports.patch | 6 +++--- .../030-pci_disable_common_quirks.patch | 4 ++-- .../patches-2.6.35/180-netfilter_depends.patch | 2 +- .../generic/patches-2.6.35/975-ssb_update.patch | 2 +- .../generic/patches-2.6.35/980-vm_exports.patch | 6 +++--- .../103-netfilter_layer7_2.6.36_fix.patch | 4 ++-- .../patches-2.6.36/180-netfilter_depends.patch | 2 +- .../generic/patches-2.6.36/980-vm_exports.patch | 6 +++--- target/linux/ifxmips/Makefile | 2 +- target/linux/iop32x/Makefile | 2 +- target/linux/ixp4xx/Makefile | 2 +- target/linux/kirkwood/Makefile | 2 +- target/linux/malta/Makefile | 2 +- target/linux/omap24xx/Makefile | 2 +- target/linux/omap35xx/Makefile | 2 +- target/linux/orion/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/ppc44x/Makefile | 2 +- target/linux/pxa/Makefile | 2 +- target/linux/rb532/Makefile | 2 +- target/linux/rdc/Makefile | 2 +- target/linux/realview/Makefile | 2 +- target/linux/sibyte/Makefile | 2 +- target/linux/uml/Makefile | 2 +- target/linux/x86/Makefile | 2 +- target/linux/xburst/Makefile | 2 +- 43 files changed, 60 insertions(+), 60 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index bdfa92dea5..21a1e034e8 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),2.6.31.14) LINUX_KERNEL_MD5SUM:=3e7feb224197d8e174a90dd3759979fd endif -ifeq ($(LINUX_VERSION),2.6.32.25) - LINUX_KERNEL_MD5SUM:=0d6ad4e7e387f56c5b5831beb97c0c1f +ifeq ($(LINUX_VERSION),2.6.32.26) + LINUX_KERNEL_MD5SUM:=bdb37b8e48aaf33d9bd6e2af3ae2f1ea endif ifeq ($(LINUX_VERSION),2.6.33.7) LINUX_KERNEL_MD5SUM:=2cea51deeaa0620a07d005ec3b148f06 @@ -20,11 +20,11 @@ endif ifeq ($(LINUX_VERSION),2.6.34.7) LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea endif -ifeq ($(LINUX_VERSION),2.6.35.8) - LINUX_KERNEL_MD5SUM:=10ccef307e81fb405b01457f312a8c66 +ifeq ($(LINUX_VERSION),2.6.35.9) + LINUX_KERNEL_MD5SUM:=18d339e9229560e73c4249dffdc3fd90 endif -ifeq ($(LINUX_VERSION),2.6.36) - LINUX_KERNEL_MD5SUM:=61f3739a73afb6914cb007f37fb09b62 +ifeq ($(LINUX_VERSION),2.6.36.1) + LINUX_KERNEL_MD5SUM:=0f1398ad1fcfc14f2420010bc8a03ca9 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index 0c319a949b..18110f9900 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk BOARD:=adm5120 BOARDNAME:=Infineon/ADMtek ADM5120 -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 SUBTARGETS:=router_le router_be INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/adm8668/Makefile b/target/linux/adm8668/Makefile index 9021e39256..4eb06d1681 100644 --- a/target/linux/adm8668/Makefile +++ b/target/linux/adm8668/Makefile @@ -11,7 +11,7 @@ BOARD:=adm8668 BOARDNAME:=Infineon WildPass ADM8668 FEATURES:=squashfs -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 40d162112c..c3cccfa454 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.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 38fa8ff7df..4b5a8a79d7 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time SUBTARGETS:=generic nand -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index d2308f376c..03ebe22ce4 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Atmel AT91 FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time -LINUX_VERSION:=2.6.35.8 +LINUX_VERSION:=2.6.35.9 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 6e29fd7d98..faef4d6be4 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index b427215743..b2b1341793 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00 FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 -LINUX_VERSION:=2.6.35.8 +LINUX_VERSION:=2.6.35.9 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 62d249610e..6a3d6d6ef2 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 49573ad562..5bdc10384d 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.35.8 +LINUX_VERSION:=2.6.35.9 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index f7beb95920..32b766d677 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cobalt Microservers FEATURES:=targz pci ext4 CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index c429e2e767..6c8b05a2df 100644 --- a/target/linux/ep93xx/Makefile +++ b/target/linux/ep93xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cirrus Logic EP93xx FEATURES:=squashfs jffs2 ext4 targz usb CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile index 2e6ccdd8b1..f6e04a497e 100644 --- a/target/linux/etrax/Makefile +++ b/target/linux/etrax/Makefile @@ -11,7 +11,7 @@ BOARD:=etrax MAINTAINER:=Claudio Mignanti BOARDNAME:=Axis ETRAX 100LX FEATURES:=squashfs jffs2 usb -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 66e956b04f..e751dca056 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch b/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch index d5824f1bdb..db2fc3849f 100644 --- a/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch +++ b/target/linux/generic/patches-2.6.32/040-use_ext4_for_ext23.patch @@ -37,7 +37,7 @@ Signed-off-by: "Theodore Ts'o" depends on EXT4_FS --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -3989,6 +3989,58 @@ static int ext4_get_sb(struct file_syste +@@ -3994,6 +3994,58 @@ static int ext4_get_sb(struct file_syste return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); } @@ -96,7 +96,7 @@ Signed-off-by: "Theodore Ts'o" static struct file_system_type ext4_fs_type = { .owner = THIS_MODULE, .name = "ext4", -@@ -4018,11 +4070,15 @@ static int __init init_ext4_fs(void) +@@ -4024,11 +4076,15 @@ static int __init init_ext4_fs(void) err = init_inodecache(); if (err) goto out1; @@ -112,7 +112,7 @@ Signed-off-by: "Theodore Ts'o" destroy_inodecache(); out1: exit_ext4_xattr(); -@@ -4038,6 +4094,8 @@ out4: +@@ -4044,6 +4100,8 @@ out4: static void __exit exit_ext4_fs(void) { diff --git a/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch b/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch index 19b5626eef..f45973e7c7 100644 --- a/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch +++ b/target/linux/generic/patches-2.6.32/041-ext4_do_not_override_ext23.patch @@ -26,7 +26,7 @@ Signed-off-by: "Theodore Ts'o" Allow the ext4 file system driver code to be used for ext2 or --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -3989,7 +3989,7 @@ static int ext4_get_sb(struct file_syste +@@ -3994,7 +3994,7 @@ static int ext4_get_sb(struct file_syste return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); } @@ -35,7 +35,7 @@ Signed-off-by: "Theodore Ts'o" static struct file_system_type ext2_fs_type = { .owner = THIS_MODULE, .name = "ext2", -@@ -4015,7 +4015,7 @@ static inline void register_as_ext2(void +@@ -4020,7 +4020,7 @@ static inline void register_as_ext2(void static inline void unregister_as_ext2(void) { } #endif diff --git a/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch b/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch index 7ac97b5010..2bf863b2d4 100644 --- a/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch +++ b/target/linux/generic/patches-2.6.32/042-ext4_add_ext23_module_aliases.patch @@ -15,7 +15,7 @@ Signed-off-by: "Theodore Ts'o" --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -4010,6 +4010,7 @@ static inline void unregister_as_ext2(vo +@@ -4015,6 +4015,7 @@ static inline void unregister_as_ext2(vo { unregister_filesystem(&ext2_fs_type); } @@ -23,7 +23,7 @@ Signed-off-by: "Theodore Ts'o" #else static inline void register_as_ext2(void) { } static inline void unregister_as_ext2(void) { } -@@ -4036,6 +4037,7 @@ static inline void unregister_as_ext3(vo +@@ -4041,6 +4042,7 @@ static inline void unregister_as_ext3(vo { unregister_filesystem(&ext3_fs_type); } diff --git a/target/linux/generic/patches-2.6.32/980-vm_exports.patch b/target/linux/generic/patches-2.6.32/980-vm_exports.patch index 5d55fa9642..d0d98b2e40 100644 --- a/target/linux/generic/patches-2.6.32/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.32/980-vm_exports.patch @@ -68,7 +68,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -6224,6 +6224,7 @@ int can_nice(const struct task_struct *p +@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } @@ -96,7 +96,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1172,6 +1172,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1181,6 +1181,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -104,7 +104,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1287,6 +1288,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1296,6 +1297,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } diff --git a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch index 0f4789a704..5fc49494a7 100644 --- a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch @@ -23,7 +23,7 @@ /* The Mellanox Tavor device gives false positive parity errors * Mark this device with a broken_parity_status, to allow * PCI scanning code to "skip" this now blacklisted device. -@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1924,7 +1925,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,7 +33,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2580,6 +2583,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ diff --git a/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch b/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch index 5532e2b350..977f892d46 100644 --- a/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch +++ b/target/linux/generic/patches-2.6.35/180-netfilter_depends.patch @@ -8,7 +8,7 @@ depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most -@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -562,7 +561,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/patches-2.6.35/975-ssb_update.patch b/target/linux/generic/patches-2.6.35/975-ssb_update.patch index 6cf41cc6a0..35d0515160 100644 --- a/target/linux/generic/patches-2.6.35/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.35/975-ssb_update.patch @@ -298,7 +298,7 @@ tx_ring_dma + size > DMA_BIT_MASK(30)) { kfree(tx_ring); goto out_err; -@@ -2176,12 +2169,14 @@ static int __devinit b44_init_one(struct +@@ -2174,12 +2167,14 @@ static int __devinit b44_init_one(struct "Failed to powerup the bus\n"); goto err_out_free_dev; } diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch index 8a021e24c7..5ca94b25a2 100644 --- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch @@ -76,7 +76,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4269,6 +4269,7 @@ int can_nice(const struct task_struct *p +@@ -4262,6 +4262,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } @@ -104,7 +104,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1182,6 +1182,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -112,7 +112,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1297,6 +1298,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } diff --git a/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch b/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch index e9aa3c967f..a2f6ff208f 100644 --- a/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch +++ b/target/linux/generic/patches-2.6.36/103-netfilter_layer7_2.6.36_fix.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -781,6 +781,27 @@ config NETFILTER_XT_MATCH_IPVS +@@ -761,6 +761,27 @@ config NETFILTER_XT_MATCH_IPVS If unsure, say N. @@ -28,7 +28,7 @@ config NETFILTER_XT_MATCH_LENGTH tristate '"length" match support' depends on NETFILTER_ADVANCED -@@ -966,26 +987,11 @@ config NETFILTER_XT_MATCH_STATE +@@ -946,26 +967,11 @@ config NETFILTER_XT_MATCH_STATE To compile it as a module, choose M here. If unsure, say N. diff --git a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch b/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch index 65c4d44c2b..4cf9fcf158 100644 --- a/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch +++ b/target/linux/generic/patches-2.6.36/180-netfilter_depends.patch @@ -8,7 +8,7 @@ depends on NETFILTER_ADVANCED help H.323 is a VoIP signalling protocol from ITU-T. As one of the most -@@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK +@@ -569,7 +568,6 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_TCPMSS tristate '"TCPMSS" target support' diff --git a/target/linux/generic/patches-2.6.36/980-vm_exports.patch b/target/linux/generic/patches-2.6.36/980-vm_exports.patch index 8cd8b16c53..d748b9b3f0 100644 --- a/target/linux/generic/patches-2.6.36/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.36/980-vm_exports.patch @@ -76,7 +76,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p +@@ -4439,6 +4439,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } @@ -104,7 +104,7 @@ * We enter with non-exclusive mmap_sem (to exclude vma changes, --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad +@@ -1186,6 +1186,7 @@ void unmap_kernel_range(unsigned long ad vunmap_page_range(addr, end); flush_tlb_kernel_range(addr, end); } @@ -112,7 +112,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) { -@@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l +@@ -1301,6 +1302,7 @@ struct vm_struct *get_vm_area(unsigned l return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END, -1, GFP_KERNEL, __builtin_return_address(0)); } diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile index 53558ef79b..9de534358f 100644 --- a/target/linux/ifxmips/Makefile +++ b/target/linux/ifxmips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Infineon Mips FEATURES:=squashfs jffs2 atm SUBTARGETS:=danube ar9 -LINUX_VERSION:=2.6.35.8 +LINUX_VERSION:=2.6.35.9 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 4785ae6eba..c5c0d27d5f 100644 --- a/target/linux/iop32x/Makefile +++ b/target/linux/iop32x/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Intel IOP32x FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 2c5bb4fe12..5a380900ff 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz SUBTARGETS=generic harddisk -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index eaca1658ba..1dbd5b1450 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Marvell Kirkwood FEATURES:=targz usb jffs2 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.35.8 +LINUX_VERSION:=2.6.35.9 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index f688262458..53afdf2696 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile index 3f114b0770..223376c3b4 100644 --- a/target/linux/omap24xx/Makefile +++ b/target/linux/omap24xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx MAINTAINER:=Michael Buesch FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 define Target/Description TI OMAP-24xx diff --git a/target/linux/omap35xx/Makefile b/target/linux/omap35xx/Makefile index cb08bf2467..e149392bb7 100644 --- a/target/linux/omap35xx/Makefile +++ b/target/linux/omap35xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP35xx FEATURES:=broken SUBTARGETS=beagleboard gumstix -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 KERNELNAME:="uImage" DEVICE_TYPE=developerboard diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 7cf9e02a7d..627e2e3a49 100644 --- a/target/linux/orion/Makefile +++ b/target/linux/orion/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic harddisk CFLAGS=-Os -pipe -march=armv5t -mtune=xscale -funit-at-a-time MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index d1508a5de9..8dac42bfbd 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index c2c4eb5912..6dee281049 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index 8da585c5e3..8496490b8c 100644 --- a/target/linux/pxa/Makefile +++ b/target/linux/pxa/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Marvell/Intel PXA2xx FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 3a2afbe453..7114b1b4d0 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=jffs2 pci targz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index be5936cfcc..9e3f3c19c6 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RDC 321x FEATURES:=squashfs jffs2 pci usb pcmcia CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index 4481b20b04..1326b42c62 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=ARM Ltd. Realview board (qemu) FEATURES:=squashfs jffs2 fpu CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -funit-at-a-time -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index 5b58ebe6c7..92b6a2a5a8 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 94a08f3bd0..034096be88 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio LINUX_CONFIG:=$(CURDIR)/config/$(ARCH) -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 5aacca58fb..a3518af778 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.32.26 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index d2270a0b14..498f80edb0 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=jffs2 targz ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=2.6.36 +LINUX_VERSION:=2.6.36.1 DEVICE_TYPE=other -- 2.30.2