summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch2
-rw-r--r--target/linux/au1000/Makefile2
-rw-r--r--target/linux/brcm47xx/Makefile2
-rw-r--r--target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch6
-rw-r--r--target/linux/ep93xx/Makefile2
-rw-r--r--target/linux/generic/config-3.21
-rw-r--r--target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch47
-rw-r--r--target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch48
-rw-r--r--target/linux/generic/patches-3.2/100-overlayfs_v11.patch6
-rw-r--r--target/linux/generic/patches-3.2/202-reduce_module_size.patch2
-rw-r--r--target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch4
-rw-r--r--target/linux/malta/Makefile2
-rw-r--r--target/linux/omap4/Makefile2
-rw-r--r--target/linux/ramips/Makefile2
16 files changed, 20 insertions, 114 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 66aca0dfe..41f100aeb 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -35,8 +35,8 @@ endif
ifeq ($(LINUX_VERSION),3.1.10)
LINUX_KERNEL_MD5SUM:=3649bdaa50ffd9114cc16486ec54d83a
endif
-ifeq ($(LINUX_VERSION),3.2.5)
- LINUX_KERNEL_MD5SUM:=17c180eaa524101ca1c675bd675eca37
+ifeq ($(LINUX_VERSION),3.2.9)
+ LINUX_KERNEL_MD5SUM:=f6c2ede7c6df0f62c8fbf7932ccf63b6
endif
# disable the md5sum check for unknown kernel versions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 8e9931de0..de0671409 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:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch b/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch
index 64ffebfbe..c405a7524 100644
--- a/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch
+++ b/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch
@@ -28,7 +28,7 @@
static struct resource ath79_eth0_resources[] = {
{
.name = "mac_base",
-@@ -817,17 +811,16 @@ void __init ath79_register_eth(unsigned
+@@ -817,17 +811,16 @@ void __init ath79_register_eth(unsigned
if (id == 0) {
pdata->reset_bit = AR934X_RESET_GE0_MAC |
AR934X_RESET_GE0_MDIO;
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 1ce821bb1..395afb8e9 100644
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci
SUBTARGETS=au1500 au1550
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini yamonenv
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index e39f6ad01..693489375 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
diff --git a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
index 2a31a2089..b1eed44d6 100644
--- a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
+++ b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
@@ -2071,7 +2071,7 @@
/**
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -1522,12 +1522,14 @@ unsigned int __devinit pci_scan_child_bu
+@@ -1527,12 +1527,14 @@ unsigned int __devinit pci_scan_child_bu
return max;
}
@@ -2089,7 +2089,7 @@
b = pci_alloc_bus();
if (!b)
-@@ -1577,8 +1579,20 @@ struct pci_bus * pci_create_bus(struct d
+@@ -1582,8 +1584,20 @@ struct pci_bus * pci_create_bus(struct d
pci_create_legacy_files(b);
b->number = b->secondary = bus;
@@ -2112,7 +2112,7 @@
return b;
-@@ -1594,18 +1608,58 @@ err_out:
+@@ -1599,18 +1613,58 @@ err_out:
return NULL;
}
diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile
index 5a6121db5..4d8febc1e 100644
--- a/target/linux/ep93xx/Makefile
+++ b/target/linux/ep93xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb
CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index 379b16745..5605f9173 100644
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -1726,6 +1726,7 @@ CONFIG_NET_VENDOR_STMICRO=y
CONFIG_NET_VENDOR_SUN=y
CONFIG_NET_VENDOR_TEHUTI=y
CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
CONFIG_NET_VENDOR_VIA=y
CONFIG_NET_VENDOR_XIRCOM=y
CONFIG_NEW_LEDS=y
diff --git a/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch b/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch
deleted file mode 100644
index 212a7a517..000000000
--- a/target/linux/generic/patches-3.2/030-lockdep-bug-Exclude-TAINT_FIRMWARE_WORKAROUND-from-d.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From df754e6af2f237a6c020c0daff55a1a609338e31 Mon Sep 17 00:00:00 2001
-From: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Date: Mon, 14 Nov 2011 13:13:49 +0100
-Subject: [PATCH 1/2] lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
-
-It's unlikely that TAINT_FIRMWARE_WORKAROUND causes false
-lockdep messages, so do not disable lockdep in that case.
-We still want to keep lockdep disabled in the
-TAINT_OOT_MODULE case:
-
- - bin-only modules can cause various instabilities in
- their and in unrelated kernel code
-
- - they are impossible to debug for kernel developers
-
- - they also typically do not have the copyright license
- permission to link to the GPL-ed lockdep code.
-
-Suggested-by: Ben Hutchings <ben@decadent.org.uk>
-Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Link: http://lkml.kernel.org/n/tip-xopopjjens57r0i13qnyh2yo@git.kernel.org
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
----
- kernel/panic.c | 12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -240,8 +240,16 @@ void add_taint(unsigned flag)
- * Also we want to keep up lockdep for staging development and
- * post-warning case.
- */
-- if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
-- printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
-+ switch (flag) {
-+ case TAINT_CRAP:
-+ case TAINT_WARN:
-+ case TAINT_FIRMWARE_WORKAROUND:
-+ break;
-+
-+ default:
-+ if (__debug_locks_off())
-+ printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
-+ }
-
- set_bit(flag, &tainted_mask);
- }
diff --git a/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch b/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch
deleted file mode 100644
index 398bb3ed2..000000000
--- a/target/linux/generic/patches-3.2/031-lockdep-bug-Exclude-TAINT_OOT_MODULE-from-disabling-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9ec84acee1e221d99dc33237bff5e82839d10cc0 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 7 Dec 2011 14:30:58 +0000
-Subject: [PATCH 2/2] lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
-
-We do want to allow lock debugging for GPL-compatible modules
-that are not (yet) built in-tree. This was disabled as a
-side-effect of commit 2449b8ba0745327c5fa49a8d9acffe03b2eded69
-('module,bug: Add TAINT_OOT_MODULE flag for modules not built
-in-tree'). Lock debug warnings now include taint flags, so
-kernel developers should still be able to deflect warnings
-caused by out-of-tree modules.
-
-The TAINT_PROPRIETARY_MODULE flag for non-GPL-compatible modules
-will still disable lock debugging.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Cc: Nick Bowler <nbowler@elliptictech.com>
-Cc: Greg KH <greg@kroah.com>
-Cc: Dave Jones <davej@redhat.com>
-Cc: Rusty Russell <rusty@rustcorp.com.au>
-Cc: Randy Dunlap <rdunlap@xenotime.net>
-Cc: Debian kernel maintainers <debian-kernel@lists.debian.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Alan Cox <alan@linux.intel.com>
-Link: http://lkml.kernel.org/r/1323268258.18450.11.camel@deadeye
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
----
- kernel/panic.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -237,11 +237,12 @@ void add_taint(unsigned flag)
- * Can't trust the integrity of the kernel anymore.
- * We don't call directly debug_locks_off() because the issue
- * is not necessarily serious enough to set oops_in_progress to 1
-- * Also we want to keep up lockdep for staging development and
-- * post-warning case.
-+ * Also we want to keep up lockdep for staging/out-of-tree
-+ * development and post-warning case.
- */
- switch (flag) {
- case TAINT_CRAP:
-+ case TAINT_OOT_MODULE:
- case TAINT_WARN:
- case TAINT_FIRMWARE_WORKAROUND:
- break;
diff --git a/target/linux/generic/patches-3.2/100-overlayfs_v11.patch b/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
index 8f80940f5..571a6c8ba 100644
--- a/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
@@ -3134,7 +3134,7 @@
/**
* enum positive_aop_returns - aop return codes with specific semantics
*
-@@ -1481,6 +1487,11 @@ struct super_block {
+@@ -1482,6 +1488,11 @@ struct super_block {
int cleancache_poolid;
struct shrinker s_shrink; /* per-sb shrinker handle */
@@ -3146,7 +3146,7 @@
};
/* superblock cache pruning functions */
-@@ -1638,6 +1649,7 @@ struct inode_operations {
+@@ -1639,6 +1650,7 @@ struct inode_operations {
void (*truncate_range)(struct inode *, loff_t, loff_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len);
@@ -3154,7 +3154,7 @@
} ____cacheline_aligned;
struct seq_file;
-@@ -2058,6 +2070,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2059,6 +2071,7 @@ extern long do_sys_open(int dfd, const c
extern struct file *filp_open(const char *, int, int);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);
diff --git a/target/linux/generic/patches-3.2/202-reduce_module_size.patch b/target/linux/generic/patches-3.2/202-reduce_module_size.patch
index 58b4a7571..f1efb90c3 100644
--- a/target/linux/generic/patches-3.2/202-reduce_module_size.patch
+++ b/target/linux/generic/patches-3.2/202-reduce_module_size.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS := -D__ASSEMBLY__
KBUILD_AFLAGS_MODULE := -DMODULE
KBUILD_CFLAGS_MODULE := -DMODULE
diff --git a/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
index c0a478b70..4a7d351b6 100644
--- a/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
@@ -10,8 +10,8 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -877,3 +879,5 @@ static void __devinit quirk_usb_early_ha
- quirk_usb_handoff_xhci(pdev);
+@@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha
+ pci_disable_device(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index 463740387..119338c5a 100644
--- a/target/linux/malta/Makefile
+++ b/target/linux/malta/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile
index 63ac069d6..f806f9ac5 100644
--- a/target/linux/omap4/Makefile
+++ b/target/linux/omap4/Makefile
@@ -11,7 +11,7 @@ BOARD:=omap4
BOARDNAME:=TI OMAP4
FEATURES:=usb targz audio display
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index c3fb0c323..926d3848c 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
FEATURES:=squashfs
-LINUX_VERSION:=3.2.5
+LINUX_VERSION:=3.2.9
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:11:38 +0000