lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/21] x86: Make get_ramdisk_{image|size}() global.
    Date
    In the following patches, we need to call get_ramdisk_{image|size}()
    to get initrd file's address and size. So make these two functions
    global.

    Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
    ---
    arch/x86/include/asm/setup.h | 3 +++
    arch/x86/kernel/setup.c | 4 ++--
    2 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
    index b7bf350..69de7a1 100644
    --- a/arch/x86/include/asm/setup.h
    +++ b/arch/x86/include/asm/setup.h
    @@ -106,6 +106,9 @@ void *extend_brk(size_t size, size_t align);
    RESERVE_BRK(name, sizeof(type) * entries)

    extern void probe_roms(void);
    +u64 get_ramdisk_image(void);
    +u64 get_ramdisk_size(void);
    +
    #ifdef __i386__

    void __init i386_start_kernel(void);
    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index 38a5952..28d2e60 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -297,7 +297,7 @@ static void __init reserve_brk(void)

    #ifdef CONFIG_BLK_DEV_INITRD

    -static u64 __init get_ramdisk_image(void)
    +u64 __init get_ramdisk_image(void)
    {
    u64 ramdisk_image = boot_params.hdr.ramdisk_image;

    @@ -305,7 +305,7 @@ static u64 __init get_ramdisk_image(void)

    return ramdisk_image;
    }
    -static u64 __init get_ramdisk_size(void)
    +u64 __init get_ramdisk_size(void)
    {
    u64 ramdisk_size = boot_params.hdr.ramdisk_size;

    --
    1.7.1


    \
     
     \ /
      Last update: 2013-07-19 23:21    [W:2.329 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site