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
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,
#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;
--- 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;
--- 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
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
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
+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.
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
#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 ( ; i<nrparts; i++) {
parts[i].size = fl->img->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);
}
--- 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
+ 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");
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;
}
}
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 */
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;
}
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 ( ; i<nrparts; i++) {
strcpy(names, fl->img->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);
}
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);
}
--- 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 */
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/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);
CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.8
+LINUX_VERSION:=3.8.1
include $(INCLUDE_DIR)/target.mk