mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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>
This commit is contained in:
parent
7982722ff7
commit
fb15abdca6
|
@ -190,7 +190,6 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name,
|
|||
void *buf, unsigned int size,
|
||||
bool get_value);
|
||||
void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name);
|
||||
void *kexec_image_load_default(struct kimage *image);
|
||||
|
||||
#ifndef arch_kexec_kernel_image_probe
|
||||
static inline int
|
||||
|
@ -207,11 +206,6 @@ static inline int arch_kimage_file_post_load_cleanup(struct kimage *image)
|
|||
}
|
||||
#endif
|
||||
|
||||
static inline void *arch_kexec_kernel_image_load(struct kimage *image)
|
||||
{
|
||||
return kexec_image_load_default(image);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KEXEC_SIG
|
||||
#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION
|
||||
int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len);
|
||||
|
|
|
@ -65,7 +65,7 @@ int kexec_image_probe_default(struct kimage *image, void *buf,
|
|||
return ret;
|
||||
}
|
||||
|
||||
void *kexec_image_load_default(struct kimage *image)
|
||||
static void *kexec_image_load_default(struct kimage *image)
|
||||
{
|
||||
if (!image->fops || !image->fops->load)
|
||||
return ERR_PTR(-ENOEXEC);
|
||||
|
@ -249,8 +249,8 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
|
|||
/* IMA needs to pass the measurement list to the next kernel. */
|
||||
ima_add_kexec_buffer(image);
|
||||
|
||||
/* Call arch image load handlers */
|
||||
ldata = arch_kexec_kernel_image_load(image);
|
||||
/* Call image load handler */
|
||||
ldata = kexec_image_load_default(image);
|
||||
|
||||
if (IS_ERR(ldata)) {
|
||||
ret = PTR_ERR(ldata);
|
||||
|
|
Loading…
Reference in a new issue