From: Greg Kroah-Hartman Date: Wed, 18 Sep 2019 13:40:19 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.14.145~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08052f26bcecbadb076140f6bd8bd87eb8707ded;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arc-configs-remove-config_initramfs_source-from-defconfigs.patch mips-netlogic-xlr-remove-erroneous-check-in-nlm_fmn_send.patch --- diff --git a/queue-4.4/arc-configs-remove-config_initramfs_source-from-defconfigs.patch b/queue-4.4/arc-configs-remove-config_initramfs_source-from-defconfigs.patch new file mode 100644 index 00000000000..83fc07d51fd --- /dev/null +++ b/queue-4.4/arc-configs-remove-config_initramfs_source-from-defconfigs.patch @@ -0,0 +1,135 @@ +From 64234961c145606b36eaa82c47b11be842b21049 Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Wed, 6 Jun 2018 15:59:38 +0300 +Subject: ARC: configs: Remove CONFIG_INITRAMFS_SOURCE from defconfigs + +From: Alexey Brodkin + +commit 64234961c145606b36eaa82c47b11be842b21049 upstream. + +We used to have pre-set CONFIG_INITRAMFS_SOURCE with local path +to intramfs in ARC defconfigs. This was quite convenient for +in-house development but not that convenient for newcomers +who obviusly don't have folders like "arc_initramfs" next to +the Linux source tree. Which leads to quite surprising failure +of defconfig building: +------------------------------->8----------------------------- + ../scripts/gen_initramfs_list.sh: Cannot open '../../arc_initramfs_hs/' +../usr/Makefile:57: recipe for target 'usr/initramfs_data.cpio.gz' failed +make[2]: *** [usr/initramfs_data.cpio.gz] Error 1 +------------------------------->8----------------------------- + +So now when more and more people start to deal with our defconfigs +let's make their life easier with removal of CONFIG_INITRAMFS_SOURCE. + +Signed-off-by: Alexey Brodkin +Cc: Kevin Hilman +Cc: stable@vger.kernel.org +Signed-off-by: Alexey Brodkin +Signed-off-by: Vineet Gupta +[backport: Fix context conflicts, drop non-existing configuration files] +Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsim_hs_defconfig | 1 - + arch/arc/configs/nsim_hs_smp_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + 9 files changed, 9 deletions(-) + +--- a/arch/arc/configs/axs101_defconfig ++++ b/arch/arc/configs/axs101_defconfig +@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" + CONFIG_EMBEDDED=y + CONFIG_PERF_EVENTS=y + # CONFIG_VM_EVENT_COUNTERS is not set +--- a/arch/arc/configs/axs103_defconfig ++++ b/arch/arc/configs/axs103_defconfig +@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" + CONFIG_EMBEDDED=y + CONFIG_PERF_EVENTS=y + # CONFIG_VM_EVENT_COUNTERS is not set +--- a/arch/arc/configs/axs103_smp_defconfig ++++ b/arch/arc/configs/axs103_smp_defconfig +@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" + CONFIG_EMBEDDED=y + CONFIG_PERF_EVENTS=y + # CONFIG_VM_EVENT_COUNTERS is not set +--- a/arch/arc/configs/nsim_700_defconfig ++++ b/arch/arc/configs/nsim_700_defconfig +@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" + CONFIG_KALLSYMS_ALL=y + CONFIG_EMBEDDED=y + # CONFIG_SLUB_DEBUG is not set +--- a/arch/arc/configs/nsim_hs_defconfig ++++ b/arch/arc/configs/nsim_hs_defconfig +@@ -12,7 +12,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" + CONFIG_KALLSYMS_ALL=y + CONFIG_EMBEDDED=y + # CONFIG_SLUB_DEBUG is not set +--- a/arch/arc/configs/nsim_hs_smp_defconfig ++++ b/arch/arc/configs/nsim_hs_smp_defconfig +@@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" + CONFIG_KALLSYMS_ALL=y + CONFIG_EMBEDDED=y + # CONFIG_SLUB_DEBUG is not set +--- a/arch/arc/configs/nsimosci_defconfig ++++ b/arch/arc/configs/nsimosci_defconfig +@@ -12,7 +12,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" + CONFIG_KALLSYMS_ALL=y + CONFIG_EMBEDDED=y + # CONFIG_SLUB_DEBUG is not set +--- a/arch/arc/configs/nsimosci_hs_defconfig ++++ b/arch/arc/configs/nsimosci_hs_defconfig +@@ -12,7 +12,6 @@ CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" + CONFIG_KALLSYMS_ALL=y + CONFIG_EMBEDDED=y + # CONFIG_SLUB_DEBUG is not set +--- a/arch/arc/configs/nsimosci_hs_smp_defconfig ++++ b/arch/arc/configs/nsimosci_hs_smp_defconfig +@@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y + # CONFIG_UTS_NS is not set + # CONFIG_PID_NS is not set + CONFIG_BLK_DEV_INITRD=y +-CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" + # CONFIG_COMPAT_BRK is not set + CONFIG_KPROBES=y + CONFIG_MODULES=y diff --git a/queue-4.4/mips-netlogic-xlr-remove-erroneous-check-in-nlm_fmn_send.patch b/queue-4.4/mips-netlogic-xlr-remove-erroneous-check-in-nlm_fmn_send.patch new file mode 100644 index 00000000000..0fc0295fa8e --- /dev/null +++ b/queue-4.4/mips-netlogic-xlr-remove-erroneous-check-in-nlm_fmn_send.patch @@ -0,0 +1,54 @@ +From 02eec6c9fc0cb13169cc97a6139771768791f92b Mon Sep 17 00:00:00 2001 +From: Paul Burton +Date: Wed, 8 Aug 2018 09:30:56 -0700 +Subject: MIPS: netlogic: xlr: Remove erroneous check in nlm_fmn_send() + +From: Paul Burton + +commit 02eec6c9fc0cb13169cc97a6139771768791f92b upstream. + +In nlm_fmn_send() we have a loop which attempts to send a message +multiple times in order to handle the transient failure condition of a +lack of available credit. When examining the status register to detect +the failure we check for a condition that can never be true, which falls +foul of gcc 8's -Wtautological-compare: + + In file included from arch/mips/netlogic/common/irq.c:65: + ./arch/mips/include/asm/netlogic/xlr/fmn.h: In function 'nlm_fmn_send': + ./arch/mips/include/asm/netlogic/xlr/fmn.h:304:22: error: bitwise + comparison always evaluates to false [-Werror=tautological-compare] + if ((status & 0x2) == 1) + ^~ + +If the path taken if this condition were true all we do is print a +message to the kernel console. Since failures seem somewhat expected +here (making the console message questionable anyway) and the condition +has clearly never evaluated true we simply remove it, rather than +attempting to fix it to check status correctly. + +Signed-off-by: Paul Burton +Patchwork: https://patchwork.linux-mips.org/patch/20174/ +Cc: Ganesan Ramalingam +Cc: James Hogan +Cc: Jayachandran C +Cc: John Crispin +Cc: Ralf Baechle +Cc: linux-mips@linux-mips.org +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/include/asm/netlogic/xlr/fmn.h | 2 -- + 1 file changed, 2 deletions(-) + +--- a/arch/mips/include/asm/netlogic/xlr/fmn.h ++++ b/arch/mips/include/asm/netlogic/xlr/fmn.h +@@ -301,8 +301,6 @@ static inline int nlm_fmn_send(unsigned + for (i = 0; i < 8; i++) { + nlm_msgsnd(dest); + status = nlm_read_c2_status0(); +- if ((status & 0x2) == 1) +- pr_info("Send pending fail!\n"); + if ((status & 0x4) == 0) + return 0; + } diff --git a/queue-4.4/series b/queue-4.4/series index 6c4d22ed9c4..ab859a00891 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,3 +22,5 @@ driver-core-fix-use-after-free-and-double-free-on-glue-directory.patch crypto-talitos-check-aes-key-size.patch crypto-talitos-check-data-blocksize-in-ablkcipher.patch x86-build-add-wnoaddress-of-packed-member-to-realmode_cflags-to-silence-gcc9-build-warning.patch +mips-netlogic-xlr-remove-erroneous-check-in-nlm_fmn_send.patch +arc-configs-remove-config_initramfs_source-from-defconfigs.patch