aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-03-03 13:57:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-03-03 13:57:40 +0000
commitf4b2c62d60b4377f65d306119a4d7a6d55720b2c (patch)
tree98acf20a98f20ce2fa6c11970e207957be466ad5
parent12920f8e47c801ebbc45367091e8b11e063565c2 (diff)
downloadupstream-f4b2c62d60b4377f65d306119a4d7a6d55720b2c.tar.gz
upstream-f4b2c62d60b4377f65d306119a4d7a6d55720b2c.tar.bz2
upstream-f4b2c62d60b4377f65d306119a4d7a6d55720b2c.zip
kernel: update linux 3.7 to 3.7.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35860 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/adm5120/Makefile2
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/brcm63xx/Makefile2
-rw-r--r--target/linux/cns21xx/Makefile2
-rw-r--r--target/linux/generic/patches-3.7/950-vm_exports.patch4
-rw-r--r--target/linux/lantiq/Makefile2
-rw-r--r--target/linux/malta/Makefile2
-rw-r--r--target/linux/mpc83xx/Makefile2
-rw-r--r--target/linux/mpc85xx/Makefile2
-rw-r--r--target/linux/ppc40x/Makefile2
-rw-r--r--target/linux/ppc44x/Makefile2
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch9
-rw-r--r--target/linux/rb532/Makefile2
-rw-r--r--target/linux/x86/alix2/target.mk2
-rw-r--r--target/linux/x86/generic/target.mk2
-rw-r--r--target/linux/x86/geos/target.mk2
18 files changed, 23 insertions, 24 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index f817bbb3e3..71669d0bc3 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -8,8 +8,8 @@ endif
ifeq ($(LINUX_VERSION),3.6.11)
LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54
endif
-ifeq ($(LINUX_VERSION),3.7.9)
- LINUX_KERNEL_MD5SUM:=c19426374acfccfa7391fc90640240cb
+ifeq ($(LINUX_VERSION),3.7.10)
+ LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec
endif
ifeq ($(LINUX_VERSION),3.8)
LINUX_KERNEL_MD5SUM:=1c738edfc54e7c65faeb90c436104e2f
diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile
index d04d652648..47555c6336 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:=3.7.9
+LINUX_VERSION:=3.7.10
SUBTARGETS:=router_le router_be rb1xx
INITRAMFS_EXTRA_FILES:=
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index de6cd39b57..cf75e81926 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 -mno-branch-likely
SUBTARGETS:=generic nand
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 904366fd58..41a8219b03 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:=3.7.9
+LINUX_VERSION:=3.7.10
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile
index 975dc6deb4..10d2df164b 100644
--- a/target/linux/cns21xx/Makefile
+++ b/target/linux/cns21xx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic/patches-3.7/950-vm_exports.patch b/target/linux/generic/patches-3.7/950-vm_exports.patch
index 85126e4d60..d72f132d63 100644
--- a/target/linux/generic/patches-3.7/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.7/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2775,6 +2775,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2781,6 +2781,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
/* common code */
@@ -16,7 +16,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2851,11 +2860,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2857,11 +2866,8 @@ int shmem_zero_setup(struct vm_area_stru
file = shmem_file_setup("dev/zero", size, vma->vm_flags);
if (IS_ERR(file))
return PTR_ERR(file);
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index d5e7148af2..ce0f0dc753 100644
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs jffs2
SUBTARGETS=xway ase falcon
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile
index e343436b0f..f6ce2d283e 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.7.9
+LINUX_VERSION:=3.7.10
DEVICE_TYPE:=developerboard
diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile
index 460db448d5..21f6433998 100644
--- a/target/linux/mpc83xx/Makefile
+++ b/target/linux/mpc83xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 0d2a5c11d0..262e1b9e3c 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540
FEATURES:=spe_fpu squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile
index 7368ffeaa7..da697adc29 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 <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile
index 9db22d499f..eda8a8bde0 100644
--- a/target/linux/ppc44x/Makefile
+++ b/target/linux/ppc44x/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs broken
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index b02c8016ed..80cc960fa5 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git a/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch b/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch
index ad2645a12d..c4d12f13d5 100644
--- a/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch
+++ b/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch
@@ -1,7 +1,7 @@
reverted:
--- a/arch/mips/ralink/rt3883/devices.c
+++ b/arch/mips/ralink/rt3883/devices.c
-@@ -177,6 +177,7 @@
+@@ -177,6 +177,7 @@ static void rt3883_usb_power_off(struct
}
static struct usb_ehci_pdata rt3883_ehci_data = {
@@ -9,10 +9,9 @@ reverted:
.power_on = rt3883_usb_power_on,
.power_off = rt3883_usb_power_off,
};
-reverted:
---- b/arch/mips/ralink/rt305x/devices.c
-+++ a/arch/mips/ralink/rt305x/devices.c
-@@ -356,6 +356,7 @@
+--- a/arch/mips/ralink/rt305x/devices.c
++++ b/arch/mips/ralink/rt305x/devices.c
+@@ -356,6 +356,7 @@ static void rt3352_usb_power_off(struct
}
static struct usb_ehci_pdata rt3352_ehci_data = {
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index 28e1740c86..8524eb63e8 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 broken
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index d12ccc9ccf..573ca238eb 100644
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \
kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
kmod-ledtrig-netdev \
kmod-cpu-msr hwclock wpad
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
CS5535_MASK:=0x0b000042
CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index b7b4c63a4a..99457401f2 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,6 +1,6 @@
BOARDNAME:=Generic
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
define Target/Description
Build firmware images for x86 based boards
diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk
index 35c0284362..167c287457 100644
--- a/target/linux/x86/geos/target.mk
+++ b/target/linux/x86/geos/target.mk
@@ -21,7 +21,7 @@ DEFAULT_PACKAGES += \
kmod-cpu-msr \
soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
hwclock wpad flashrom tc
-LINUX_VERSION:=3.7.9
+LINUX_VERSION:=3.7.10
CS5535_MASK:=0x0E000048
CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \