lkml.org 
[lkml]   [2016]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/13] efi/arm64: Drop __init annotation from handle_kernel_image()
    Date
    From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

    After moving arm64-stub.c to libstub/, all of its sections are emitted
    as .init.xxx sections automatically, and the __init annotation of
    handle_kernel_image() causes it to end up in .init.init.text, which is
    not recognized as an __init section by the linker scripts. So drop the
    annotation.

    Acked-by: Will Deacon <will.deacon@arm.com>
    Acked-by: Mark Rutland <mark.rutland@arm.com>
    Tested-by: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
    ---
    drivers/firmware/efi/libstub/arm64-stub.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
    index 78dfbd34b6bf..9e0342745e4f 100644
    --- a/drivers/firmware/efi/libstub/arm64-stub.c
    +++ b/drivers/firmware/efi/libstub/arm64-stub.c
    @@ -13,13 +13,13 @@
    #include <asm/efi.h>
    #include <asm/sections.h>

    -efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table_arg,
    - unsigned long *image_addr,
    - unsigned long *image_size,
    - unsigned long *reserve_addr,
    - unsigned long *reserve_size,
    - unsigned long dram_base,
    - efi_loaded_image_t *image)
    +efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg,
    + unsigned long *image_addr,
    + unsigned long *image_size,
    + unsigned long *reserve_addr,
    + unsigned long *reserve_size,
    + unsigned long dram_base,
    + efi_loaded_image_t *image)
    {
    efi_status_t status;
    unsigned long kernel_size, kernel_memsize = 0;
    --
    2.6.2
    \
     
     \ /
      Last update: 2016-02-17 14:01    [W:4.060 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site