ifeq ($(LINUX_VERSION),3.2.16)
LINUX_KERNEL_MD5SUM:=246e6bd28ea44c90ec66c7f8b56e4803
endif
-ifeq ($(LINUX_VERSION),3.3.4)
- LINUX_KERNEL_MD5SUM:=113baeccd2a3341ecc62ae5e73c2ed1d
+ifeq ($(LINUX_VERSION),3.3.5)
+ LINUX_KERNEL_MD5SUM:=2f6b7da0418e26312bcabd08ab448569
endif
# disable the md5sum check for unknown kernel versions
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
SUBTARGETS:=router_le router_be rb1xx
INITRAMFS_EXTRA_FILES:=
FEATURES:=squashfs
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci
FEATURES:=squashfs jffs2 atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
SUBTARGETS:=generic nand
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
+++ /dev/null
-From 51233d66e030239f99755b2983753eff9b748365 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Wed, 14 Mar 2012 10:28:35 +0100
-Subject: [PATCH 04/47] MIPS: ath79: fix AR933X WMAC reset code
-
-The current code puts the built-in WMAC device of the
-AR933X SoCs into reset instead of starting it. This
-causes a hard lock on AR933X based boards when the
-wireless driver tries to access the device.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Cc: stable@vger.kernel.org
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/3484/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
----
- arch/mips/ath79/dev-wmac.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/mips/ath79/dev-wmac.c
-+++ b/arch/mips/ath79/dev-wmac.c
-@@ -58,8 +58,8 @@ static void __init ar913x_wmac_setup(voi
-
- static int ar933x_wmac_reset(void)
- {
-- ath79_device_reset_clear(AR933X_RESET_WMAC);
- ath79_device_reset_set(AR933X_RESET_WMAC);
-+ ath79_device_reset_clear(AR933X_RESET_WMAC);
-
- return 0;
- }
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
SUBTARGETS:=9g20 9260 9263
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
BOARDNAME:=Atheros AR231x/AR5312
FEATURES:=squashfs jffs2
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx
FEATURES:=squashfs jffs2 usb atm pci pcmcia
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk
#include <board_bcm963xx.h>
#include <bcm_tag.h>
-@@ -944,6 +945,9 @@ int __init board_register_devices(void)
+@@ -943,6 +944,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
#include <board_bcm963xx.h>
#include <bcm_tag.h>
-@@ -945,6 +946,9 @@ int __init board_register_devices(void)
+@@ -944,6 +945,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -876,7 +876,7 @@ static struct mtd_partition mtd_partitio
+@@ -875,7 +875,7 @@ static struct mtd_partition mtd_partitio
}
};
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -848,6 +848,8 @@ void __init board_prom_init(void)
+@@ -847,6 +847,8 @@ void __init board_prom_init(void)
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -948,6 +948,10 @@ int __init board_register_devices(void)
+@@ -947,6 +947,10 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2161,6 +2235,13 @@ int __init board_register_devices(void)
+@@ -2160,6 +2234,13 @@ int __init board_register_devices(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
};
static void __init nb4_nvram_fixup(void)
-@@ -2283,12 +2361,25 @@ void __init board_prom_init(void)
- bcm63xx_pci_enabled = 1;
+@@ -2282,12 +2360,25 @@ void __init board_prom_init(void)
+ if (board.has_pci) {
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
+
FEATURES:=squashfs broken
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
+@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
+@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
-@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk
+@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk
}
#endif
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -3855,6 +3855,7 @@ int can_nice(const struct task_struct *p
+@@ -3854,6 +3854,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
pluto MACH_PLUTO PLUTO 3869
acfx100 MACH_ACFX100 ACFX100 3870
msm8625_rumi3 MACH_MSM8625_RUMI3 MSM8625_RUMI3 3871
-@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX
+@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX
huangshans MACH_HUANGSHANS HUANGSHANS 3879
bosphorus1 MACH_BOSPHORUS1 BOSPHORUS1 3880
prima MACH_PRIMA PRIMA 3881
+EXPORT_SYMBOL_GPL(twd_timer_get_rate);
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
-@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct
+@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct
spin_lock(&wdt_lock);
/* Assume prescale is set to 256 */
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -176,6 +176,10 @@ struct sk_buff *__alloc_skb(unsigned int
+@@ -177,6 +177,10 @@ struct sk_buff *__alloc_skb(unsigned int
struct sk_buff *skb;
u8 *data;
cache = fclone ? skbuff_fclone_cache : skbuff_head_cache;
/* Get the HEAD */
-@@ -929,6 +933,10 @@ int pskb_expand_head(struct sk_buff *skb
+@@ -946,6 +950,10 @@ int pskb_expand_head(struct sk_buff *skb
if (skb_shared(skb))
BUG();
+#endif
--- a/net/Kconfig
+++ b/net/Kconfig
-@@ -72,6 +72,12 @@ config INET
+@@ -78,6 +78,12 @@ config INET
Short answer: say Y.
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
FEATURES:=targz ext4
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
BOARDNAME:=TI OMAP4
FEATURES:=usb targz audio display
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs broken
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
FEATURES:=squashfs
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz broken
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
FEATURES:=ext4 audio
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
include $(INCLUDE_DIR)/target.mk
-LINUX_VERSION:=3.3.4
+LINUX_VERSION:=3.3.5
BOARDNAME:=Traverse Geos
FEATURES:=squashfs jffs2 ext4 pci usb gpio
DEFAULT_PACKAGES += \
projects / openwrt / staging / stintel.git / commitdiff