Commit fe74eb28 authored by Coiby Xu's avatar Coiby Xu Committed by Andrew Morton
Browse files

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: default avatarCoiby Xu <coxu@redhat.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202602120648.RgQALnnI-lkp@intel.com/


Acked-by: default avatarBaoquan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 03738dd1

include/linux/crash_core.h

+7 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ static inline void arch_kexec_protect_crashkres(void) { } 
static inline void arch_kexec_unprotect_crashkres(void) { }

#endif



#ifdef CONFIG_CRASH_DM_CRYPT

int crash_load_dm_crypt_keys(struct kimage *image);

ssize_t dm_crypt_keys_read(char *buf, size_t count, u64 *ppos);

#else

static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; }

#endif



#ifndef arch_crash_handle_hotplug_event

static inline void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) { }

#endif
@@ -96,4 +89,11 @@ static inline void crash_save_cpu(struct pt_regs *regs, int cpu) {}; 
static inline int kimage_crash_copy_vmcoreinfo(struct kimage *image) { return 0; };

#endif /* CONFIG_CRASH_DUMP*/



#ifdef CONFIG_CRASH_DM_CRYPT

int crash_load_dm_crypt_keys(struct kimage *image);

ssize_t dm_crypt_keys_read(char *buf, size_t count, u64 *ppos);

#else

static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; }

#endif



#endif /* LINUX_CRASH_CORE_H */