From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
"Li Zhengyu" <lizhengyu3@huawei.com>,
"Palmer Dabbelt" <palmer@rivosinc.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"kexec@lists.infradead.org" <kexec@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Eric Biederman <ebiederm@xmission.com>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>
Subject: Re: [PATCH v2] kexec_file: Drop weak attribute from arch_kexec_apply_relocations[_add]
Date: Sun, 29 May 2022 09:46:47 +0000 [thread overview]
Message-ID: <264786d9-7756-19e0-2742-8b8d17f5ace5@csgroup.eu> (raw)
In-Reply-To: <20220529065637.xgapqjp2342flbuj@pengutronix.de>
Le 29/05/2022 à 08:56, Uwe Kleine-König a écrit :
> Hello,
>
> on current linux-next ARCH=riscv allmodconfig breaks with:
>
> CC arch/riscv/kernel/elf_kexec.o
> arch/riscv/kernel/elf_kexec.c:345:5: error: redefinition of ‘arch_kexec_apply_relocations_add’
> 345 | int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from arch/riscv/kernel/elf_kexec.c:16:
> include/linux/kexec.h:236:1: note: previous definition of ‘arch_kexec_apply_relocations_add’ with type ‘int(struct purgatory_info *, Elf64_Shdr *, const Elf64_Shdr *, const Elf64_Shdr *)’ {aka ‘int(struct purgatory_info *, struct elf64_shdr *, const struct elf64_shdr *, const struct elf64_shdr *)’}
> 236 | arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> (I think) because there is a conflict between the two commits:
>
> 233c1e6c319c kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]
> 838b3e28488f RISC-V: Load purgatory in kexec_file
>
> And so next is broken starting from
> 164a9037b1d33f28ba27671c16ec1c23d4a11acf which merges the riscv tree.
>
In arch/riscv/include/asm/kexec.h, do the same as s390 did in commit
233c1e6c319c:
diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h
index 7f3c9ac34bd8..540dd469b088 100644
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
@@ -83,4 +83,12 @@ struct kimage_arch {
extern const struct kexec_file_ops s390_kexec_image_ops;
extern const struct kexec_file_ops s390_kexec_elf_ops;
+#ifdef CONFIG_KEXEC_FILE
+struct purgatory_info;
+int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
+ Elf_Shdr *section,
+ const Elf_Shdr *relsec,
+ const Elf_Shdr *symtab);
+#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add
+#endif
#endif /*_S390_KEXEC_H */
next prev parent reply other threads:[~2022-05-29 9:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 9:12 [PATCH v2] kexec_file: Drop weak attribute from arch_kexec_apply_relocations[_add] Naveen N. Rao
2022-05-19 15:17 ` kernel test robot
2022-05-19 17:29 ` Andrew Morton
2022-05-29 6:56 ` Uwe Kleine-König
2022-05-29 9:46 ` Christophe Leroy [this message]
2022-05-29 14:06 ` Uwe Kleine-König
2022-05-30 1:43 ` liaochang (A)
2022-05-30 7:42 ` [PATCH] RISC-V: Prepare dropping week " Uwe Kleine-König
2022-05-30 18:58 ` Palmer Dabbelt
2022-05-30 19:41 ` Uwe Kleine-König
2022-05-30 23:11 ` Palmer Dabbelt
2022-05-31 5:58 ` Uwe Kleine-König
2022-05-31 15:45 ` Palmer Dabbelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=264786d9-7756-19e0-2742-8b8d17f5ace5@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=kernel@pengutronix.de \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lizhengyu3@huawei.com \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=palmer@rivosinc.com \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).