lkml.org 
[lkml]   [2022]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] kexec: Remove unnecessary arch_kexec_kernel_image_load()
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    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.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

    kexec: make static

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    include/linux/kexec.h | 6 ------
    kernel/kexec_file.c | 6 +++---
    2 files changed, 3 insertions(+), 9 deletions(-)

    diff --git a/include/linux/kexec.h b/include/linux/kexec.h
    index c08d5d52223a..8844e7debfa4 100644
    --- a/include/linux/kexec.h
    +++ b/include/linux/kexec.h
    @@ -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);
    diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
    index dd5983010b7b..39ddf09ab573 100644
    --- a/kernel/kexec_file.c
    +++ b/kernel/kexec_file.c
    @@ -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);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-12-15 19:24    [W:6.118 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site