From 77ec3b2de9bb1880b258ec6aaf4949f146f6fd8d Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 19 Mar 2012 18:23:31 +0000 Subject: kernel: update linux 3.2 to 3.2.12 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31028 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/Makefile | 2 +- target/linux/au1000/Makefile | 2 +- target/linux/brcm47xx/Makefile | 2 +- target/linux/cns21xx/Makefile | 2 +- target/linux/ep93xx/Makefile | 2 +- target/linux/generic/patches-3.2/440-block2mtd_init.patch | 4 ++-- .../generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch | 8 ++++---- .../generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch | 2 +- target/linux/malta/Makefile | 2 +- target/linux/mpc52xx/Makefile | 2 +- target/linux/omap4/Makefile | 2 +- target/linux/ppc40x/Makefile | 2 +- target/linux/ppc44x/Makefile | 2 +- target/linux/ppc44x/patches/100-openwrt_flashmap.patch | 2 +- target/linux/ramips/Makefile | 2 +- target/linux/uml/Makefile | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) (limited to 'target') diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index cd4a14d47..30610f8c6 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.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 395afb8e9..0125d8824 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 -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 693489375..dfa0cd714 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.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 3c7a1d33a..b519f3935 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs broken CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index 4d8febc1e..6c5044ba3 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 -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.2/440-block2mtd_init.patch b/target/linux/generic/patches-3.2/440-block2mtd_init.patch index 53979b267..513fbcadb 100644 --- a/target/linux/generic/patches-3.2/440-block2mtd_init.patch +++ b/target/linux/generic/patches-3.2/440-block2mtd_init.patch @@ -106,8 +106,8 @@ { --- a/fs/partitions/check.c +++ b/fs/partitions/check.c -@@ -664,6 +664,7 @@ rescan: - kfree(state); +@@ -696,6 +696,7 @@ int invalidate_partitions(struct gendisk + return 0; } +EXPORT_SYMBOL(rescan_partitions); diff --git a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch index 9203e0174..6b79e5463 100644 --- a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch @@ -32,7 +32,7 @@ +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -1107,7 +1107,7 @@ out: +@@ -1111,7 +1111,7 @@ out: return ret; } @@ -41,7 +41,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1232,7 +1232,6 @@ try_nextdev: +@@ -1236,7 +1236,6 @@ try_nextdev: in6_ifa_put(hiscore->ifa); return 0; } @@ -49,7 +49,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) -@@ -4814,6 +4813,9 @@ int __init addrconf_init(void) +@@ -4818,6 +4817,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4832,6 +4834,9 @@ void addrconf_cleanup(void) +@@ -4836,6 +4838,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch index 06b05f8af..91139854b 100644 --- a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch @@ -100,7 +100,7 @@ --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -824,7 +824,7 @@ static void __br_multicast_send_query(st +@@ -827,7 +827,7 @@ static void __br_multicast_send_query(st if (port) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 119338c5a..47ade6978 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index 6d69e9983..4c7cd5b98 100644 --- a/target/linux/mpc52xx/Makefile +++ b/target/linux/mpc52xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e FEATURES:=targz ext4 -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile index f806f9ac5..1f3f88985 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.9 +LINUX_VERSION:=3.2.12 CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Imre Kaloz diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 87d5d6b56..cceee1d8d 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 629eab036..35addf25d 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440 MAINTAINER:=Imre Kaloz -LINUX_VERSION:=3.2.11 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch index 225831a4b..471e686d3 100644 --- a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch +++ b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch @@ -25,7 +25,7 @@ label = "env"; --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts -@@ -217,24 +217,12 @@ +@@ -222,24 +222,12 @@ #address-cells = <1>; #size-cells = <1>; partition@0 { diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 926d3848c..0bd0f7c82 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.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 14a11db6d..4f4ef7ff8 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk -- cgit v1.2.3