diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-07 19:07:22 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-07 19:07:22 +0200 |
commit | 153cd7752e6a2483d9f617d5682d0b02f7c22581 (patch) | |
tree | 7f24cce77d67e01c74a2138e27b1d5afd751733a | |
parent | 374f9b424f71f19d84f103d7350c1dd1d13cfae2 (diff) |
linux: update to 4.9.31/4.11.4
-rw-r--r-- | mk/kernel-ver.mk | 8 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion | 4 | ||||
-rw-r--r-- | target/linux/patches/4.11.3/0001-sparc-Fix-Wstringop-overflow-warning.patch | 76 | ||||
-rw-r--r-- | target/linux/patches/4.11.4/0001-sparc64.patch (renamed from target/linux/patches/4.11.3/0001-sparc64.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.30/0001-sparc-Fix-Wstringop-overflow-warning.patch | 76 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/crisv32_ethernet_driver.patch (renamed from target/linux/patches/4.9.30/crisv32_ethernet_driver.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/h8300.patch (renamed from target/linux/patches/4.9.30/h8300.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.9.30/initramfs-nosizelimit.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/ld-or1k.patch (renamed from target/linux/patches/4.9.30/ld-or1k.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/macsonic.patch (renamed from target/linux/patches/4.9.30/macsonic.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/microblaze-sigaltstack.patch (renamed from target/linux/patches/4.9.30/microblaze-sigaltstack.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/or1k-more-ram.patch (renamed from target/linux/patches/4.9.30/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/patch-realtime (renamed from target/linux/patches/4.9.30/patch-realtime) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/sh2.patch (renamed from target/linux/patches/4.9.30/sh2.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/startup.patch (renamed from target/linux/patches/4.9.30/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.9.31/vdso2.patch (renamed from target/linux/patches/4.9.30/vdso2.patch) | 0 |
16 files changed, 6 insertions, 158 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index a0b8ca0d8..3b1d653f7 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -16,16 +16,16 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_11),y) -KERNEL_FILE_VER:= 4.11.3 +KERNEL_FILE_VER:= 4.11.4 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 5bfd9ed52c1ccd8dcd6418646d5a78b0af501cfdcd3e0900f1918ecba1a8af97 +KERNEL_HASH:= 83d4e60e6af7cb8449437f72ce0a6bc311ddcdd3dac2754f015e9b6b55448a90 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y) -KERNEL_FILE_VER:= 4.9.30 +KERNEL_FILE_VER:= 4.9.31 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 4272ef025ce8cd717c9291b5cbe587e13c15901d8c26ceebc471af3a1d730bbb +KERNEL_HASH:= 28cad8b66216da2550155b7a77f37041bde40b821567d1b288e5e9fb6cca9856 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6),y) KERNEL_FILE_VER:= 4.6.2 diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index a34b2ca79..16dfde03e 100644 --- a/target/config/Config.in.kernelversion +++ b/target/config/Config.in.kernelversion @@ -28,7 +28,7 @@ config ADK_TARGET_KERNEL_VERSION_GIT select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK config ADK_TARGET_KERNEL_VERSION_4_11 - bool "4.11.3" + bool "4.11.4" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG @@ -38,7 +38,7 @@ config ADK_TARGET_KERNEL_VERSION_4_11 depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU config ADK_TARGET_KERNEL_VERSION_4_9 - bool "4.9.30" + bool "4.9.31" depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 diff --git a/target/linux/patches/4.11.3/0001-sparc-Fix-Wstringop-overflow-warning.patch b/target/linux/patches/4.11.3/0001-sparc-Fix-Wstringop-overflow-warning.patch deleted file mode 100644 index 2782fc451..000000000 --- a/target/linux/patches/4.11.3/0001-sparc-Fix-Wstringop-overflow-warning.patch +++ /dev/null @@ -1,76 +0,0 @@ -From deba804c90642c8ed0f15ac1083663976d578f54 Mon Sep 17 00:00:00 2001 -From: Orlando Arias <oarias@knights.ucf.edu> -Date: Tue, 16 May 2017 15:34:00 -0400 -Subject: [PATCH] sparc: Fix -Wstringop-overflow warning - -Greetings, - -GCC 7 introduced the -Wstringop-overflow flag to detect buffer overflows -in calls to string handling functions [1][2]. Due to the way -``empty_zero_page'' is declared in arch/sparc/include/setup.h, this -causes a warning to trigger at compile time in the function mem_init(), -which is subsequently converted to an error. The ensuing patch fixes -this issue and aligns the declaration of empty_zero_page to that of -other architectures. Thank you. - -Cheers, -Orlando. - -[1] https://gcc.gnu.org/ml/gcc-patches/2016-10/msg02308.html -[2] https://gcc.gnu.org/gcc-7/changes.html - -Signed-off-by: Orlando Arias <oarias@knights.ucf.edu> - --------------------------------------------------------------------------------- -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - arch/sparc/include/asm/pgtable_32.h | 4 ++-- - arch/sparc/include/asm/setup.h | 2 +- - arch/sparc/mm/init_32.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h -index ce6f569..cf19072 100644 ---- a/arch/sparc/include/asm/pgtable_32.h -+++ b/arch/sparc/include/asm/pgtable_32.h -@@ -91,9 +91,9 @@ extern unsigned long pfn_base; - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ --extern unsigned long empty_zero_page; -+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; - --#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page)) -+#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) - - /* - * In general all page table modifications should use the V8 atomic -diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h -index 478bf6bb..3fae200 100644 ---- a/arch/sparc/include/asm/setup.h -+++ b/arch/sparc/include/asm/setup.h -@@ -16,7 +16,7 @@ extern char reboot_command[]; - */ - extern unsigned char boot_cpu_id; - --extern unsigned long empty_zero_page; -+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; - - extern int serial_console; - static inline int con_is_present(void) -diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c -index c6afe98..3bd0d51 100644 ---- a/arch/sparc/mm/init_32.c -+++ b/arch/sparc/mm/init_32.c -@@ -290,7 +290,7 @@ void __init mem_init(void) - - - /* Saves us work later. */ -- memset((void *)&empty_zero_page, 0, PAGE_SIZE); -+ memset((void *)empty_zero_page, 0, PAGE_SIZE); - - i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5); - i += 1; --- -2.1.4 - diff --git a/target/linux/patches/4.11.3/0001-sparc64.patch b/target/linux/patches/4.11.4/0001-sparc64.patch index f75eb5a23..f75eb5a23 100644 --- a/target/linux/patches/4.11.3/0001-sparc64.patch +++ b/target/linux/patches/4.11.4/0001-sparc64.patch diff --git a/target/linux/patches/4.9.30/0001-sparc-Fix-Wstringop-overflow-warning.patch b/target/linux/patches/4.9.30/0001-sparc-Fix-Wstringop-overflow-warning.patch deleted file mode 100644 index 2782fc451..000000000 --- a/target/linux/patches/4.9.30/0001-sparc-Fix-Wstringop-overflow-warning.patch +++ /dev/null @@ -1,76 +0,0 @@ -From deba804c90642c8ed0f15ac1083663976d578f54 Mon Sep 17 00:00:00 2001 -From: Orlando Arias <oarias@knights.ucf.edu> -Date: Tue, 16 May 2017 15:34:00 -0400 -Subject: [PATCH] sparc: Fix -Wstringop-overflow warning - -Greetings, - -GCC 7 introduced the -Wstringop-overflow flag to detect buffer overflows -in calls to string handling functions [1][2]. Due to the way -``empty_zero_page'' is declared in arch/sparc/include/setup.h, this -causes a warning to trigger at compile time in the function mem_init(), -which is subsequently converted to an error. The ensuing patch fixes -this issue and aligns the declaration of empty_zero_page to that of -other architectures. Thank you. - -Cheers, -Orlando. - -[1] https://gcc.gnu.org/ml/gcc-patches/2016-10/msg02308.html -[2] https://gcc.gnu.org/gcc-7/changes.html - -Signed-off-by: Orlando Arias <oarias@knights.ucf.edu> - --------------------------------------------------------------------------------- -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - arch/sparc/include/asm/pgtable_32.h | 4 ++-- - arch/sparc/include/asm/setup.h | 2 +- - arch/sparc/mm/init_32.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h -index ce6f569..cf19072 100644 ---- a/arch/sparc/include/asm/pgtable_32.h -+++ b/arch/sparc/include/asm/pgtable_32.h -@@ -91,9 +91,9 @@ extern unsigned long pfn_base; - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ --extern unsigned long empty_zero_page; -+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; - --#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page)) -+#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) - - /* - * In general all page table modifications should use the V8 atomic -diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h -index 478bf6bb..3fae200 100644 ---- a/arch/sparc/include/asm/setup.h -+++ b/arch/sparc/include/asm/setup.h -@@ -16,7 +16,7 @@ extern char reboot_command[]; - */ - extern unsigned char boot_cpu_id; - --extern unsigned long empty_zero_page; -+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; - - extern int serial_console; - static inline int con_is_present(void) -diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c -index c6afe98..3bd0d51 100644 ---- a/arch/sparc/mm/init_32.c -+++ b/arch/sparc/mm/init_32.c -@@ -290,7 +290,7 @@ void __init mem_init(void) - - - /* Saves us work later. */ -- memset((void *)&empty_zero_page, 0, PAGE_SIZE); -+ memset((void *)empty_zero_page, 0, PAGE_SIZE); - - i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5); - i += 1; --- -2.1.4 - diff --git a/target/linux/patches/4.9.30/crisv32_ethernet_driver.patch b/target/linux/patches/4.9.31/crisv32_ethernet_driver.patch index 0cef202fc..0cef202fc 100644 --- a/target/linux/patches/4.9.30/crisv32_ethernet_driver.patch +++ b/target/linux/patches/4.9.31/crisv32_ethernet_driver.patch diff --git a/target/linux/patches/4.9.30/h8300.patch b/target/linux/patches/4.9.31/h8300.patch index a58b3f137..a58b3f137 100644 --- a/target/linux/patches/4.9.30/h8300.patch +++ b/target/linux/patches/4.9.31/h8300.patch diff --git a/target/linux/patches/4.9.30/initramfs-nosizelimit.patch b/target/linux/patches/4.9.31/initramfs-nosizelimit.patch index 40d2f6bd8..40d2f6bd8 100644 --- a/target/linux/patches/4.9.30/initramfs-nosizelimit.patch +++ b/target/linux/patches/4.9.31/initramfs-nosizelimit.patch diff --git a/target/linux/patches/4.9.30/ld-or1k.patch b/target/linux/patches/4.9.31/ld-or1k.patch index 264f9166f..264f9166f 100644 --- a/target/linux/patches/4.9.30/ld-or1k.patch +++ b/target/linux/patches/4.9.31/ld-or1k.patch diff --git a/target/linux/patches/4.9.30/macsonic.patch b/target/linux/patches/4.9.31/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/4.9.30/macsonic.patch +++ b/target/linux/patches/4.9.31/macsonic.patch diff --git a/target/linux/patches/4.9.30/microblaze-sigaltstack.patch b/target/linux/patches/4.9.31/microblaze-sigaltstack.patch index c4064e8b9..c4064e8b9 100644 --- a/target/linux/patches/4.9.30/microblaze-sigaltstack.patch +++ b/target/linux/patches/4.9.31/microblaze-sigaltstack.patch diff --git a/target/linux/patches/4.9.30/or1k-more-ram.patch b/target/linux/patches/4.9.31/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.9.30/or1k-more-ram.patch +++ b/target/linux/patches/4.9.31/or1k-more-ram.patch diff --git a/target/linux/patches/4.9.30/patch-realtime b/target/linux/patches/4.9.31/patch-realtime index ab9028ddd..ab9028ddd 100644 --- a/target/linux/patches/4.9.30/patch-realtime +++ b/target/linux/patches/4.9.31/patch-realtime diff --git a/target/linux/patches/4.9.30/sh2.patch b/target/linux/patches/4.9.31/sh2.patch index 9debe80ad..9debe80ad 100644 --- a/target/linux/patches/4.9.30/sh2.patch +++ b/target/linux/patches/4.9.31/sh2.patch diff --git a/target/linux/patches/4.9.30/startup.patch b/target/linux/patches/4.9.31/startup.patch index e54ac19a6..e54ac19a6 100644 --- a/target/linux/patches/4.9.30/startup.patch +++ b/target/linux/patches/4.9.31/startup.patch diff --git a/target/linux/patches/4.9.30/vdso2.patch b/target/linux/patches/4.9.31/vdso2.patch index 35df488a8..35df488a8 100644 --- a/target/linux/patches/4.9.30/vdso2.patch +++ b/target/linux/patches/4.9.31/vdso2.patch |