From: Greg Kroah-Hartman Date: Thu, 21 Jan 2021 12:49:35 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.4.253~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77d2bb82b49f15d048be9ade8b09ea1bb2ea7805;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: elfcore-fix-building-with-clang.patch scsi-lpfc-make-function-lpfc_defer_pt2pt_acc-static.patch scsi-lpfc-make-lpfc_defer_acc_rsp-static.patch --- diff --git a/queue-5.4/elfcore-fix-building-with-clang.patch b/queue-5.4/elfcore-fix-building-with-clang.patch new file mode 100644 index 00000000000..61cc0b9c7f8 --- /dev/null +++ b/queue-5.4/elfcore-fix-building-with-clang.patch @@ -0,0 +1,110 @@ +From 6e7b64b9dd6d96537d816ea07ec26b7dedd397b9 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Fri, 11 Dec 2020 13:36:46 -0800 +Subject: elfcore: fix building with clang + +From: Arnd Bergmann + +commit 6e7b64b9dd6d96537d816ea07ec26b7dedd397b9 upstream. + +kernel/elfcore.c only contains weak symbols, which triggers a bug with +clang in combination with recordmcount: + + Cannot find symbol for section 2: .text. + kernel/elfcore.o: failed + +Move the empty stubs into linux/elfcore.h as inline functions. As only +two architectures use these, just use the architecture specific Kconfig +symbols to key off the declaration. + +Link: https://lkml.kernel.org/r/20201204165742.3815221-2-arnd@kernel.org +Signed-off-by: Arnd Bergmann +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Barret Rhoden +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Cc: Jian Cai +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/elfcore.h | 22 ++++++++++++++++++++++ + kernel/Makefile | 1 - + kernel/elfcore.c | 26 -------------------------- + 3 files changed, 22 insertions(+), 27 deletions(-) + +--- a/include/linux/elfcore.h ++++ b/include/linux/elfcore.h +@@ -58,6 +58,7 @@ static inline int elf_core_copy_task_xfp + } + #endif + ++#if defined(CONFIG_UM) || defined(CONFIG_IA64) + /* + * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the gate DSO contents. Dumping its +@@ -72,5 +73,26 @@ elf_core_write_extra_phdrs(struct coredu + extern int + elf_core_write_extra_data(struct coredump_params *cprm); + extern size_t elf_core_extra_data_size(void); ++#else ++static inline Elf_Half elf_core_extra_phdrs(void) ++{ ++ return 0; ++} ++ ++static inline int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) ++{ ++ return 1; ++} ++ ++static inline int elf_core_write_extra_data(struct coredump_params *cprm) ++{ ++ return 1; ++} ++ ++static inline size_t elf_core_extra_data_size(void) ++{ ++ return 0; ++} ++#endif + + #endif /* _LINUX_ELFCORE_H */ +--- a/kernel/Makefile ++++ b/kernel/Makefile +@@ -93,7 +93,6 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayac + obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o + obj-$(CONFIG_TRACEPOINTS) += tracepoint.o + obj-$(CONFIG_LATENCYTOP) += latencytop.o +-obj-$(CONFIG_ELFCORE) += elfcore.o + obj-$(CONFIG_FUNCTION_TRACER) += trace/ + obj-$(CONFIG_TRACING) += trace/ + obj-$(CONFIG_TRACE_CLOCK) += trace/ +--- a/kernel/elfcore.c ++++ /dev/null +@@ -1,26 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-#include +-#include +-#include +-#include +-#include +- +-Elf_Half __weak elf_core_extra_phdrs(void) +-{ +- return 0; +-} +- +-int __weak elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) +-{ +- return 1; +-} +- +-int __weak elf_core_write_extra_data(struct coredump_params *cprm) +-{ +- return 1; +-} +- +-size_t __weak elf_core_extra_data_size(void) +-{ +- return 0; +-} diff --git a/queue-5.4/scsi-lpfc-make-function-lpfc_defer_pt2pt_acc-static.patch b/queue-5.4/scsi-lpfc-make-function-lpfc_defer_pt2pt_acc-static.patch new file mode 100644 index 00000000000..a09253e25b2 --- /dev/null +++ b/queue-5.4/scsi-lpfc-make-function-lpfc_defer_pt2pt_acc-static.patch @@ -0,0 +1,36 @@ +From f7cb0d0945ebc9879aff72cf7b3342fd1040ffaa Mon Sep 17 00:00:00 2001 +From: zhengbin +Date: Fri, 4 Oct 2019 18:04:37 +0800 +Subject: scsi: lpfc: Make function lpfc_defer_pt2pt_acc static + +From: zhengbin + +commit f7cb0d0945ebc9879aff72cf7b3342fd1040ffaa upstream. + +Fix sparse warnings: + +drivers/scsi/lpfc/lpfc_nportdisc.c:290:1: warning: symbol 'lpfc_defer_pt2pt_acc' was not declared. Should it be static? + +Link: https://lore.kernel.org/r/1570183477-137273-1-git-send-email-zhengbin13@huawei.com +Reported-by: Hulk Robot +Signed-off-by: zhengbin +Reviewed-by: Dick Kennedy +Reviewed-by: James Smart +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/lpfc/lpfc_nportdisc.c ++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c +@@ -286,7 +286,7 @@ lpfc_els_abort(struct lpfc_hba *phba, st + * This routine is only called if we are SLI3, direct connect pt2pt + * mode and the remote NPort issues the PLOGI after link up. + */ +-void ++static void + lpfc_defer_pt2pt_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *link_mbox) + { + LPFC_MBOXQ_t *login_mbox; diff --git a/queue-5.4/scsi-lpfc-make-lpfc_defer_acc_rsp-static.patch b/queue-5.4/scsi-lpfc-make-lpfc_defer_acc_rsp-static.patch new file mode 100644 index 00000000000..d1883c72fca --- /dev/null +++ b/queue-5.4/scsi-lpfc-make-lpfc_defer_acc_rsp-static.patch @@ -0,0 +1,34 @@ +From fdb827e4a3f84cb92e286a821114ac0ad79c8281 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Tue, 7 Jan 2020 09:49:56 +0800 +Subject: scsi: lpfc: Make lpfc_defer_acc_rsp static + +From: YueHaibing + +commit fdb827e4a3f84cb92e286a821114ac0ad79c8281 upstream. + +Fix sparse warning: + +drivers/scsi/lpfc/lpfc_nportdisc.c:344:1: warning: + symbol 'lpfc_defer_acc_rsp' was not declared. Should it be static? + +Link: https://lore.kernel.org/r/20200107014956.41748-1-yuehaibing@huawei.com +Reported-by: Hulk Robot +Reviewed-by: James Smart +Signed-off-by: YueHaibing +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c +index 1c46e3adbda2..a024e5a3918f 100644 +--- a/drivers/scsi/lpfc/lpfc_nportdisc.c ++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c +@@ -340,7 +340,7 @@ lpfc_defer_pt2pt_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *link_mbox) + * This routine is only called if we are SLI4, acting in target + * mode and the remote NPort issues the PLOGI after link up. + **/ +-void ++static void + lpfc_defer_acc_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) + { + struct lpfc_vport *vport = pmb->vport; diff --git a/queue-5.4/series b/queue-5.4/series index f58353f4bdc..b9be1a2c205 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,6 @@ usb-ohci-make-distrust_firmware-param-default-to-false.patch compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch xen-privcmd-allow-fetching-resource-sizes.patch +elfcore-fix-building-with-clang.patch +scsi-lpfc-make-function-lpfc_defer_pt2pt_acc-static.patch +scsi-lpfc-make-lpfc_defer_acc_rsp-static.patch