Skip to content

Commit fe74eb2

Browse files
coibyakpm00
authored andcommitted
crash: align the declaration of crash_load_dm_crypt_keys with CONFIG_CRASH_DM_CRYPT
This will prevent a compilation failure when CONFIG_CRASH_DUMP is enabled but CONFIG_CRASH_DM_CRYPT is disabled, arch/powerpc/kexec/elf_64.c: In function 'elf64_load': >> arch/powerpc/kexec/elf_64.c:82:23: error: implicit declaration of function 'crash_load_dm_crypt_keys' [-Werror=implicit-function-declaration] 82 | ret = crash_load_dm_crypt_keys(image); | ^~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors Link: https://lkml.kernel.org/r/20260225060347.718905-3-coxu@redhat.com Signed-off-by: Coiby Xu <coxu@redhat.com> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202602120648.RgQALnnI-lkp@intel.com/ Acked-by: Baoquan He <bhe@redhat.com> Cc: Arnaud Lefebvre <arnaud.lefebvre@clever-cloud.com> Cc: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Cc: Dave Young <dyoung@redhat.com> Cc: Kairui Song <ryncsn@gmail.com> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Pingfan Liu <kernelfans@gmail.com> Cc: Rob Herring <robh@kernel.org> Cc: Sourabh Jain <sourabhjain@linux.ibm.com> Cc: Thomas Staudt <tstaudt@de.ibm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 03738dd commit fe74eb2

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

include/linux/crash_core.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ static inline void arch_kexec_protect_crashkres(void) { }
3434
static inline void arch_kexec_unprotect_crashkres(void) { }
3535
#endif
3636

37-
#ifdef CONFIG_CRASH_DM_CRYPT
38-
int crash_load_dm_crypt_keys(struct kimage *image);
39-
ssize_t dm_crypt_keys_read(char *buf, size_t count, u64 *ppos);
40-
#else
41-
static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; }
42-
#endif
43-
4437
#ifndef arch_crash_handle_hotplug_event
4538
static inline void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) { }
4639
#endif
@@ -96,4 +89,11 @@ static inline void crash_save_cpu(struct pt_regs *regs, int cpu) {};
9689
static inline int kimage_crash_copy_vmcoreinfo(struct kimage *image) { return 0; };
9790
#endif /* CONFIG_CRASH_DUMP*/
9891

92+
#ifdef CONFIG_CRASH_DM_CRYPT
93+
int crash_load_dm_crypt_keys(struct kimage *image);
94+
ssize_t dm_crypt_keys_read(char *buf, size_t count, u64 *ppos);
95+
#else
96+
static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; }
97+
#endif
98+
9999
#endif /* LINUX_CRASH_CORE_H */

0 commit comments

Comments
 (0)