tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kexec: remove unnecessary arch_kexec_kernel_image_load()

arch_kexec_kernel_image_load() only calls kexec_image_load_default(), and
there are no arch-specific implementations.

Remove the unnecessary arch_kexec_kernel_image_load() and make
kexec_image_load_default() static.

No functional change intended.

Link: https://lkml.kernel.org/r/20230307224416.907040-3-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Bjorn Helgaas and committed by
Andrew Morton fb15abdc 7982722f

+3 -9
-6
include/linux/kexec.h
··· 190 190 void *buf, unsigned int size, 191 191 bool get_value); 192 192 void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name); 193 - void *kexec_image_load_default(struct kimage *image); 194 193 195 194 #ifndef arch_kexec_kernel_image_probe 196 195 static inline int ··· 205 206 return kexec_image_post_load_cleanup_default(image); 206 207 } 207 208 #endif 208 - 209 - static inline void *arch_kexec_kernel_image_load(struct kimage *image) 210 - { 211 - return kexec_image_load_default(image); 212 - } 213 209 214 210 #ifdef CONFIG_KEXEC_SIG 215 211 #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION
+3 -3
kernel/kexec_file.c
··· 65 65 return ret; 66 66 } 67 67 68 - void *kexec_image_load_default(struct kimage *image) 68 + static void *kexec_image_load_default(struct kimage *image) 69 69 { 70 70 if (!image->fops || !image->fops->load) 71 71 return ERR_PTR(-ENOEXEC); ··· 249 249 /* IMA needs to pass the measurement list to the next kernel. */ 250 250 ima_add_kexec_buffer(image); 251 251 252 - /* Call arch image load handlers */ 253 - ldata = arch_kexec_kernel_image_load(image); 252 + /* Call image load handler */ 253 + ldata = kexec_image_load_default(image); 254 254 255 255 if (IS_ERR(ldata)) { 256 256 ret = PTR_ERR(ldata);