From 84b30485742005f4a44388f40191e302a893669c Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 3 Apr 2011 13:59:07 +0000 Subject: [PATCH] kernel: Update to version 2.6.37.6 Thank you Peter Wagner for the patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26441 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar7/Makefile | 2 +- target/linux/ar71xx/Makefile | 2 +- target/linux/atheros/Makefile | 2 +- target/linux/au1000/Makefile | 2 +- target/linux/avr32/Makefile | 2 +- target/linux/brcm63xx/Makefile | 2 +- target/linux/gemini/Makefile | 2 +- .../patches-2.6.37/012-extra_optimization.patch | 4 ++-- .../030-pci_disable_common_quirks.patch | 8 ++++---- .../801-usb_serial_endpoint_size.patch | 13 +++++++------ .../generic/patches-2.6.37/980-vm_exports.patch | 3 ++- target/linux/imx21/Makefile | 2 +- target/linux/iop32x/Makefile | 2 +- target/linux/ixp4xx/Makefile | 2 +- target/linux/kirkwood/Makefile | 2 +- target/linux/lantiq/Makefile | 2 +- target/linux/malta/Makefile | 2 +- target/linux/octeon/Makefile | 2 +- target/linux/orion/Makefile | 2 +- target/linux/pxa/Makefile | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/realview/Makefile | 2 +- target/linux/sibyte/Makefile | 2 +- target/linux/uml/Makefile | 2 +- target/linux/xburst/Makefile | 2 +- 25 files changed, 36 insertions(+), 34 deletions(-) diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 4ae2a5a9d..7ec039df2 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 5b17f90ec..f2fbf6be8 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 -fno-caller-saves SUBTARGETS:=generic nand -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 91dadea7e..dea803246 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index c02454a61..67421d127 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 8d367d5b3..199c346ba 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index bba054392..1d544357a 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index ee602eef7..dac4c623f 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.37/012-extra_optimization.patch b/target/linux/generic/patches-2.6.37/012-extra_optimization.patch index 4ffa26e9e..a7811d78f 100644 --- a/target/linux/generic/patches-2.6.37/012-extra_optimization.patch +++ b/target/linux/generic/patches-2.6.37/012-extra_optimization.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -538,9 +538,9 @@ +@@ -538,9 +538,9 @@ endif # $(dot-config) all: vmlinux ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE @@ -12,7 +12,7 @@ endif include $(srctree)/arch/$(SRCARCH)/Makefile -@@ -595,6 +595,9 @@ +@@ -595,6 +595,9 @@ endif NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS += $(NOSTDINC_FLAGS) diff --git a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch index a95143710..462798639 100644 --- a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.37/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. -@@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,10 +33,10 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); +@@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + quirk_msi_intx_disable_bug); - #endif /* CONFIG_PCI_IOV */ + #endif /* CONFIG_PCI_MSI */ +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ /* Allow manual resource allocation for PCI hotplug bridges diff --git a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch index 3725b922c..1646fdf1b 100644 --- a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch @@ -8,16 +8,17 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac +@@ -912,7 +913,8 @@ int usb_serial_probe(struct usb_interfac + goto probe_error; } - buffer_size = serial->type->bulk_in_size; - if (!buffer_size) -- buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); -+ buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize; + buffer_size = max_t(int, serial->type->bulk_in_size, +- le16_to_cpu(endpoint->wMaxPacketSize)); ++ max_t(int, le16_to_cpu(endpoint->wMaxPacketSize), ++ maxSize)); port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); -@@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL"); +@@ -1391,3 +1393,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/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch index 2a965b22f..ce4910666 100644 --- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch @@ -25,7 +25,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc//maps -@@ -2780,9 +2791,6 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2780,10 +2791,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); @@ -34,6 +34,7 @@ - vma->vm_file = file; - vma->vm_ops = &shmem_vm_ops; + shmem_set_file(vma, file); + vma->vm_flags |= VM_CAN_NONLINEAR; return 0; } --- a/fs/file.c diff --git a/target/linux/imx21/Makefile b/target/linux/imx21/Makefile index 8d46dd182..0ca5c8a75 100644 --- a/target/linux/imx21/Makefile +++ b/target/linux/imx21/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale i.MX21 FEATURES:=jffs2 broken CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 DEVICE_TYPE=phone diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 414cac563..e1e028496 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index cff5b75cc..87e1e0671 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index 37d6d3d0b..06b6fc7f0 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 05a41beb4..fa74e95af 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY FEATURES:=squashfs jffs2 SUBTARGETS:=falcon xway -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 8cd200aaf..9ffb3de4e 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index 4d79a1aa7..185dd77a1 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Octeon FEATURES:=squashfs jffs2 pci usb CFLAGS:=-Os -pipe -march=octeon -fno-caller-saves -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index feb07492c..78e1f97a5 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 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index 32bb77d6e..1d5054de3 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index f4e20e6bd..5535199b6 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves FEATURES:=squashfs -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=kmod-leds-gpio wpad-mini diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index ddc8d70ec..0bd94ac0d 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 -fno-caller-saves -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index 2240e94e1..67036f7ad 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk CFLAGS:=-Os -pipe -march=sb1 -fno-caller-saves MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 70646b20f..6f952f55d 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.37.4 +LINUX_VERSION:=2.6.37.6 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 32bd2f91f..aae1a8ee5 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.37.4 +LINUX_VERSION:=2.6.37.6 DEVICE_TYPE=other -- 2.20.1