From 26fbc15a86a5915b1a2c7e62737a382e3020065c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 3 Mar 2013 13:58:52 +0000 Subject: [PATCH] kernel: update linux 3.8 to 3.8.1 Signed-off-by: Gabor Juhos SVN-Revision: 35862 --- include/kernel-version.mk | 4 ++-- .../ar71xx/patches-3.8/902-unaligned_access_hacks.patch | 4 ++-- .../atheros/patches-3.8/001-get_c0_compare_int_fix.patch | 2 +- target/linux/atheros/patches-3.8/100-board.patch | 4 ++-- .../atheros/patches-3.8/101-early-printk-support.patch | 2 +- target/linux/atheros/patches-3.8/130-watchdog.patch | 2 +- .../atheros/patches-3.8/140-redboot_boardconfig.patch | 6 +++--- .../atheros/patches-3.8/141-redboot_partition_scan.patch | 9 ++++----- .../patches-3.8/142-redboot_various_erase_size_fix.patch | 6 +++--- target/linux/generic/patches-3.8/100-overlayfs.patch | 2 +- target/linux/generic/patches-3.8/950-vm_exports.patch | 4 ++-- target/linux/mvebu/Makefile | 2 +- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 71669d0bc3..0c58ad8410 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -11,8 +11,8 @@ endif ifeq ($(LINUX_VERSION),3.7.10) LINUX_KERNEL_MD5SUM:=09624c3702107076efcac5e1cd8a18ec endif -ifeq ($(LINUX_VERSION),3.8) - LINUX_KERNEL_MD5SUM:=1c738edfc54e7c65faeb90c436104e2f +ifeq ($(LINUX_VERSION),3.8.1) + LINUX_KERNEL_MD5SUM:=093b172f907d5455a6746418ad18f5bc endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch index 5b23b11fc6..2426e071a3 100644 --- a/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.8/902-unaligned_access_hacks.patch @@ -242,7 +242,7 @@ np->rxopt.bits.osrcrt)) || --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -994,7 +994,7 @@ void ip6_route_input(struct sk_buff *skb +@@ -995,7 +995,7 @@ void ip6_route_input(struct sk_buff *skb .flowi6_iif = skb->dev->ifindex, .daddr = iph->daddr, .saddr = iph->saddr, @@ -467,7 +467,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1391,8 +1391,8 @@ static struct sk_buff **inet_gro_receive +@@ -1396,8 +1396,8 @@ static struct sk_buff **inet_gro_receive if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; diff --git a/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch index 43da96c3fe..ff6cc998ff 100644 --- a/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch +++ b/target/linux/atheros/patches-3.8/001-get_c0_compare_int_fix.patch @@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c -@@ -168,20 +168,23 @@ int __cpuinit r4k_clockevent_init(void) +@@ -173,20 +173,23 @@ int __cpuinit r4k_clockevent_init(void) struct clock_event_device *cd; unsigned int irq; diff --git a/target/linux/atheros/patches-3.8/100-board.patch b/target/linux/atheros/patches-3.8/100-board.patch index bd00d93064..56c1f6943d 100644 --- a/target/linux/atheros/patches-3.8/100-board.patch +++ b/target/linux/atheros/patches-3.8/100-board.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -120,6 +120,19 @@ config BCM63XX +@@ -135,6 +135,19 @@ config BCM63XX help Support for BCM63XX based boards @@ -20,7 +20,7 @@ config MIPS_COBALT bool "Cobalt Server" select CEVT_R4K -@@ -813,6 +826,7 @@ config NLM_XLP_BOARD +@@ -836,6 +849,7 @@ config NLM_XLP_BOARD endchoice diff --git a/target/linux/atheros/patches-3.8/101-early-printk-support.patch b/target/linux/atheros/patches-3.8/101-early-printk-support.patch index 90e9f2ed42..7b0b2ec4de 100644 --- a/target/linux/atheros/patches-3.8/101-early-printk-support.patch +++ b/target/linux/atheros/patches-3.8/101-early-printk-support.patch @@ -58,7 +58,7 @@ obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -130,6 +130,7 @@ config ATHEROS_AR231X +@@ -145,6 +145,7 @@ config ATHEROS_AR231X select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_32BIT_KERNEL select ARCH_REQUIRE_GPIOLIB diff --git a/target/linux/atheros/patches-3.8/130-watchdog.patch b/target/linux/atheros/patches-3.8/130-watchdog.patch index 908fa711e3..374565c057 100644 --- a/target/linux/atheros/patches-3.8/130-watchdog.patch +++ b/target/linux/atheros/patches-3.8/130-watchdog.patch @@ -202,7 +202,7 @@ +module_exit(exit_ar2315_wdt); --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -1064,6 +1064,12 @@ config LANTIQ_WDT +@@ -1076,6 +1076,12 @@ config LANTIQ_WDT help Hardware driver for the Lantiq SoC Watchdog Timer. diff --git a/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch b/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch index db8377b303..4191b0d426 100644 --- a/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch +++ b/target/linux/atheros/patches-3.8/140-redboot_boardconfig.patch @@ -17,7 +17,7 @@ int nrparts = 0; struct fis_image_desc *buf; struct mtd_partition *parts; -@@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru +@@ -225,14 +228,14 @@ static int parse_redboot_partitions(stru } } #endif @@ -34,7 +34,7 @@ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) { strcpy(nullname, nullstring); -@@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru +@@ -251,6 +254,8 @@ static int parse_redboot_partitions(stru } #endif for ( ; iimg->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; -@@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru +@@ -284,6 +289,14 @@ static int parse_redboot_partitions(stru fl = fl->next; kfree(tmp_fl); } diff --git a/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch index c83823a219..c255baf8c6 100644 --- a/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch +++ b/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -79,6 +79,11 @@ static int parse_redboot_partitions(stru +@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru static char nullstring[] = "unallocated"; #endif @@ -11,8 +11,7 @@ + restart: if ( directory < 0 ) { offset = master->size + directory * master->erasesize; - while (mtd_can_have_bb(master) && -@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru + while (mtd_block_isbad(master, offset)) { if (!offset) { nogood: printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); @@ -20,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -99,10 +105,6 @@ static int parse_redboot_partitions(stru +@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru goto nogood; } } @@ -31,7 +30,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -175,6 +177,11 @@ static int parse_redboot_partitions(stru +@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch b/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch index 0ad155efd8..fa00dcd3b4 100644 --- a/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch +++ b/target/linux/atheros/patches-3.8/142-redboot_various_erase_size_fix.patch @@ -31,7 +31,7 @@ unsigned long offset; #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; -@@ -188,7 +205,10 @@ static int parse_redboot_partitions(stru +@@ -186,7 +203,10 @@ static int parse_redboot_partitions(stru goto out; } @@ -43,7 +43,7 @@ struct fis_list *new_fl, **prev; if (buf[i].name[0] == 0xff) { -@@ -263,12 +283,13 @@ static int parse_redboot_partitions(stru +@@ -261,12 +281,13 @@ static int parse_redboot_partitions(stru } #endif for ( ; iimg->name); #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY if (!memcmp(names, "RedBoot", 8) || -@@ -298,7 +319,9 @@ static int parse_redboot_partitions(stru +@@ -296,7 +317,9 @@ static int parse_redboot_partitions(stru fl = fl->next; kfree(tmp_fl); } diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch index 5d481174c3..5297c261c4 100644 --- a/target/linux/generic/patches-3.8/100-overlayfs.patch +++ b/target/linux/generic/patches-3.8/100-overlayfs.patch @@ -319,7 +319,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1410,6 +1410,24 @@ void drop_collected_mounts(struct vfsmou +@@ -1417,6 +1417,24 @@ void drop_collected_mounts(struct vfsmou release_mounts(&umount_list); } diff --git a/target/linux/generic/patches-3.8/950-vm_exports.patch b/target/linux/generic/patches-3.8/950-vm_exports.patch index aae62f2380..66015992c1 100644 --- a/target/linux/generic/patches-3.8/950-vm_exports.patch +++ b/target/linux/generic/patches-3.8/950-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2865,6 +2865,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); +@@ -2871,6 +2871,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//maps -@@ -2941,11 +2950,8 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2947,11 +2956,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/mvebu/Makefile b/target/linux/mvebu/Makefile index 1c36ad79b4..37c72f8e46 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2 pci pcie gpio CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.8 +LINUX_VERSION:=3.8.1 include $(INCLUDE_DIR)/target.mk -- 2.30.2