From: Stijn Tintel Date: Sun, 3 Sep 2017 06:34:10 +0000 (+0300) Subject: kernel: update 4.9 to 4.9.47 X-Git-Tag: v18.06.0-rc1~2306 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=046618f5da1c94f085de8504fcfc26ee858ddde4;p=openwrt%2Fstaging%2Fchunkeey.git kernel: update 4.9 to 4.9.47 Refresh patches. Compile-tested on ramips/mt7621 and x86/64. Runtime-tested on ramips/mt7621 and x86/64. Signed-off-by: Stijn Tintel --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0ed92dccae..875a7605f1 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,11 +4,11 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 LINUX_VERSION-4.4 = .85 -LINUX_VERSION-4.9 = .45 +LINUX_VERSION-4.9 = .47 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c LINUX_KERNEL_HASH-4.4.85 = cfa49f631587e4587ba04236ce0e56765ea938c26815d5a29eec561b21d0f055 -LINUX_KERNEL_HASH-4.9.45 = 66e5d18dc79a59606b270a1e221a0a80ac09a9e5cd13b1a8b608c514ae15666d +LINUX_KERNEL_HASH-4.9.47 = 75be9679d69460a45e77a61474a6d8eee34de21b9929fe4992971dff122541c9 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/bcm53xx/patches-4.9/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-4.9/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch index bafa4e4b1d..244a4a6586 100644 --- a/target/linux/bcm53xx/patches-4.9/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch +++ b/target/linux/bcm53xx/patches-4.9/700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki #include "b53_regs.h" #include "b53_priv.h" -@@ -1522,6 +1523,28 @@ static int b53_switch_init(struct b53_de +@@ -1578,6 +1579,28 @@ static int b53_switch_init(struct b53_de return ret; } diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch index 8eed08ea3d..428fcb6501 100644 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ b/target/linux/generic/hack-4.9/220-gc_sections.patch @@ -201,7 +201,7 @@ Signed-off-by: Gabor Juhos --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -114,7 +114,7 @@ +@@ -130,7 +130,7 @@ #ifdef CONFIG_KPROBES #define KPROBE_BLACKLIST() . = ALIGN(8); \ VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \ @@ -210,7 +210,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .; #else #define KPROBE_BLACKLIST() -@@ -123,10 +123,10 @@ +@@ -139,10 +139,10 @@ #ifdef CONFIG_EVENT_TRACING #define FTRACE_EVENTS() . = ALIGN(8); \ VMLINUX_SYMBOL(__start_ftrace_events) = .; \ @@ -223,7 +223,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .; #else #define FTRACE_EVENTS() -@@ -147,7 +147,7 @@ +@@ -163,7 +163,7 @@ #ifdef CONFIG_FTRACE_SYSCALLS #define TRACE_SYSCALLS() . = ALIGN(8); \ VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \ @@ -232,7 +232,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; #else #define TRACE_SYSCALLS() -@@ -156,7 +156,7 @@ +@@ -172,7 +172,7 @@ #ifdef CONFIG_SERIAL_EARLYCON #define EARLYCON_TABLE() STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__earlycon_table) = .; \ @@ -241,7 +241,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__earlycon_table_end) = .; #else #define EARLYCON_TABLE() -@@ -169,8 +169,8 @@ +@@ -185,8 +185,8 @@ #define _OF_TABLE_1(name) \ . = ALIGN(8); \ VMLINUX_SYMBOL(__##name##_of_table) = .; \ @@ -252,7 +252,7 @@ Signed-off-by: Gabor Juhos #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) -@@ -193,7 +193,7 @@ +@@ -209,7 +209,7 @@ #define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ @@ -261,7 +261,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__dtb_end) = .; /* -@@ -214,16 +214,17 @@ +@@ -227,16 +227,17 @@ /* implement dynamic printk debug */ \ . = ALIGN(8); \ VMLINUX_SYMBOL(__start___jump_table) = .; \ @@ -282,7 +282,7 @@ Signed-off-by: Gabor Juhos /* * Data section helpers -@@ -291,35 +292,35 @@ +@@ -304,35 +305,35 @@ /* PCI quirks */ \ .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \ @@ -327,7 +327,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__end_builtin_fw) = .; \ } \ \ -@@ -397,7 +398,7 @@ +@@ -410,7 +411,7 @@ \ /* Kernel symbol table: strings */ \ __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ @@ -336,7 +336,7 @@ Signed-off-by: Gabor Juhos } \ \ /* __*init sections */ \ -@@ -410,14 +411,14 @@ +@@ -423,14 +424,14 @@ /* Built-in module parameters. */ \ __param : AT(ADDR(__param) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___param) = .; \ @@ -353,7 +353,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___modver) = .; \ . = ALIGN((align)); \ VMLINUX_SYMBOL(__end_rodata) = .; \ -@@ -482,7 +483,7 @@ +@@ -496,7 +497,7 @@ #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__entry_text_start) = .; \ @@ -362,7 +362,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__entry_text_end) = .; #if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) -@@ -520,7 +521,7 @@ +@@ -534,7 +535,7 @@ . = ALIGN(align); \ __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ex_table) = .; \ @@ -371,7 +371,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___ex_table) = .; \ } -@@ -536,9 +537,9 @@ +@@ -550,9 +551,9 @@ #ifdef CONFIG_CONSTRUCTORS #define KERNEL_CTORS() . = ALIGN(8); \ VMLINUX_SYMBOL(__ctors_start) = .; \ @@ -383,7 +383,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__ctors_end) = .; #else #define KERNEL_CTORS() -@@ -595,7 +596,7 @@ +@@ -609,7 +610,7 @@ #define SBSS(sbss_align) \ . = ALIGN(sbss_align); \ .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ @@ -392,7 +392,7 @@ Signed-off-by: Gabor Juhos *(.scommon) \ } -@@ -662,7 +663,7 @@ +@@ -676,7 +677,7 @@ . = ALIGN(8); \ __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___bug_table) = .; \ @@ -401,7 +401,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___bug_table) = .; \ } #else -@@ -674,7 +675,7 @@ +@@ -688,7 +689,7 @@ . = ALIGN(4); \ .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__tracedata_start) = .; \ @@ -410,7 +410,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__tracedata_end) = .; \ } #else -@@ -691,7 +692,7 @@ +@@ -705,7 +706,7 @@ #define INIT_SETUP(initsetup_align) \ . = ALIGN(initsetup_align); \ VMLINUX_SYMBOL(__setup_start) = .; \ diff --git a/target/linux/generic/hack-4.9/221-module_exports.patch b/target/linux/generic/hack-4.9/221-module_exports.patch index 016cb62a4c..fddf57b47c 100644 --- a/target/linux/generic/hack-4.9/221-module_exports.patch +++ b/target/linux/generic/hack-4.9/221-module_exports.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #include /* Align . to a 8 byte boundary equals to maximum function alignment. */ -@@ -329,14 +339,14 @@ +@@ -342,14 +352,14 @@ /* Kernel symbol table: Normal symbols */ \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab) = .; \ @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \ } \ \ -@@ -398,7 +408,7 @@ +@@ -411,7 +421,7 @@ \ /* Kernel symbol table: strings */ \ __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -749,6 +759,8 @@ +@@ -763,6 +773,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch index 77e11f7230..b0af139f83 100644 --- a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -1979,7 +1979,7 @@ static int __init pktsched_init(void) +@@ -1976,7 +1976,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch b/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch index 4991c52d36..c155961862 100644 --- a/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch +++ b/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch @@ -1,7 +1,5 @@ -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -24,6 +24,7 @@ #include @@ -402,10 +400,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c eth->netdev[id]->netdev_ops = &mtk_netdev_ops; eth->netdev[id]->base_addr = (unsigned long)eth->base; -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -80,7 +80,6 @@ /* CDMP Ingress Control Register */ diff --git a/target/linux/mediatek/patches-4.9/0060-eth-debug.patch b/target/linux/mediatek/patches-4.9/0060-eth-debug.patch index fb36ddf380..902a72ed8e 100644 --- a/target/linux/mediatek/patches-4.9/0060-eth-debug.patch +++ b/target/linux/mediatek/patches-4.9/0060-eth-debug.patch @@ -1,7 +1,5 @@ -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -851,6 +851,7 @@ static void mtk_stop_queue(struct mtk_et continue; netif_stop_queue(eth->netdev[i]); @@ -58,10 +56,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c eth->netdev[id]->netdev_ops = &mtk_netdev_ops; eth->netdev[id]->base_addr = (unsigned long)eth->base; -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -601,6 +601,8 @@ struct mtk_eth { struct mii_bus *mii_bus; struct work_struct pending_work; diff --git a/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch b/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch index 20f10a337a..e6f1cf69d6 100644 --- a/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch +++ b/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch @@ -1,7 +1,5 @@ -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1904,12 +1904,16 @@ static int mtk_open(struct net_device *d struct mtk_mac *mac = netdev_priv(dev); struct mtk_eth *eth = mac->hw; @@ -62,10 +60,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c spin_lock_init(ð->page_lock); spin_lock_init(ð->tx_irq_lock); spin_lock_init(ð->rx_irq_lock); -Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h -=================================================================== ---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h -+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -573,6 +573,7 @@ struct mtk_rx_ring { struct mtk_eth { struct device *dev;