kernel: update 4.9 to 4.9.45
authorKoen Vandeputte <koen.vandeputte@ncentric.com>
Mon, 28 Aug 2017 11:37:07 +0000 (13:37 +0200)
committerJohn Crispin <john@phrozen.org>
Wed, 30 Aug 2017 15:05:10 +0000 (17:05 +0200)
Refreshed all patches

Compiled & run-tested on targets: cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
include/kernel-version.mk
target/linux/generic/hack-4.9/930-crashlog.patch
target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
target/linux/ramips/patches-4.9/0070-weak_reordering.patch
target/linux/ramips/patches-4.9/101-mt7621-timer.patch

index 897c5a0fa4472e241e4397d4ef490341e3db6eb2..da10076218ff8f2aa048951b98bc3a1b4d9cacfe 100644 (file)
@@ -4,11 +4,11 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .43
 LINUX_VERSION-4.4 = .83
-LINUX_VERSION-4.9 = .44
+LINUX_VERSION-4.9 = .45
 
 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
 LINUX_KERNEL_HASH-4.4.83 = 5b5f0a0a6cdadcbe5e1c1c057470bb42880590fc97edee299fb1833d646856b4
-LINUX_KERNEL_HASH-4.9.44 = 44a6386150d843da8fe13363377972ab040cc710268033ac99f599d5ba8ce3a3
+LINUX_KERNEL_HASH-4.9.45 = 66e5d18dc79a59606b270a1e221a0a80ac09a9e5cd13b1a8b608c514ae15666d
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
index 15d5ef4d679ee2920da163b5fac6921cfac817d8..baa87b1b7fd464dea6dc51b65965b31fe048cedb 100644 (file)
@@ -318,7 +318,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  #include <asm/sections.h>
  #include <linux/io.h>
-@@ -499,6 +500,8 @@ static void __init_memblock memblock_ins
+@@ -495,6 +496,8 @@ static void __init_memblock memblock_ins
        memblock_set_region_node(rgn, nid);
        type->cnt++;
        type->total_size += size;
@@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  }
  
  /**
-@@ -538,6 +541,8 @@ int __init_memblock memblock_add_range(s
+@@ -534,6 +537,8 @@ int __init_memblock memblock_add_range(s
                type->regions[0].flags = flags;
                memblock_set_region_node(&type->regions[0], nid);
                type->total_size = size;
index a5d3a3db32b988370fe801aea3d293c534b9ca16..f3abf34a9ff24e56f7babfea229dcfc67be2ff12 100644 (file)
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -5905,7 +5905,7 @@ static void __ref alloc_node_mem_map(str
+@@ -5909,7 +5909,7 @@ static void __ref alloc_node_mem_map(str
                mem_map = NODE_DATA(0)->node_mem_map;
  #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
                if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
index 5961c49f95115d3e4d53dbdcbd467bf37ff7d77b..5a4b6cb6686042941fe149cd74de408c1c9ab6f1 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-4.9.44/arch/mips/ralink/Kconfig
-===================================================================
---- linux-4.9.44.orig/arch/mips/ralink/Kconfig
-+++ linux-4.9.44/arch/mips/ralink/Kconfig
+--- a/arch/mips/ralink/Kconfig
++++ b/arch/mips/ralink/Kconfig
 @@ -56,6 +56,7 @@ choice
                select COMMON_CLK
                select CLKSRC_MIPS_GIC
index 9d02d0d7543bd60729f27428c14dc3c5c33aa81a..552716a21d1b21d6e5c01f2a2aa2f16318c5bb40 100644 (file)
@@ -1,7 +1,5 @@
-Index: linux-4.9.44/arch/mips/ralink/mt7621.c
-===================================================================
---- linux-4.9.44.orig/arch/mips/ralink/mt7621.c
-+++ linux-4.9.44/arch/mips/ralink/mt7621.c
+--- a/arch/mips/ralink/mt7621.c
++++ b/arch/mips/ralink/mt7621.c
 @@ -18,6 +18,7 @@
  #include <asm/mach-ralink/ralink_regs.h>
  #include <asm/mach-ralink/mt7621.h>
@@ -69,10 +67,8 @@ Index: linux-4.9.44/arch/mips/ralink/mt7621.c
  void prom_soc_init(struct ralink_soc_info *soc_info)
  {
        void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
-Index: linux-4.9.44/arch/mips/ralink/Kconfig
-===================================================================
---- linux-4.9.44.orig/arch/mips/ralink/Kconfig
-+++ linux-4.9.44/arch/mips/ralink/Kconfig
+--- a/arch/mips/ralink/Kconfig
++++ b/arch/mips/ralink/Kconfig
 @@ -57,6 +57,7 @@ choice
                select CLKSRC_MIPS_GIC
                select HW_HAS_PCI
@@ -81,10 +77,8 @@ Index: linux-4.9.44/arch/mips/ralink/Kconfig
  endchoice
  
  choice
-Index: linux-4.9.44/arch/mips/ralink/timer-gic.c
-===================================================================
---- linux-4.9.44.orig/arch/mips/ralink/timer-gic.c
-+++ linux-4.9.44/arch/mips/ralink/timer-gic.c
+--- a/arch/mips/ralink/timer-gic.c
++++ b/arch/mips/ralink/timer-gic.c
 @@ -12,6 +12,7 @@
  #include <linux/of.h>
  #include <linux/clk-provider.h>