lkml.org 
[lkml]   [2007]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] lguest: clean rest of linkage warnings (bar one)
    From
    Date
    My previous warning fix broke lguest if your text size wasn't correct
    to make the __start_paravirtprobe aligned correctly. Put the separate
    paravirtprobe section back, but inside the init section so it gets
    discarded.

    It also fixes the remaining warnings, except one. The code in
    modpost.c which needs to be taught that it's legal to link from
    .paravirtprobe to .init.text is horrible, and I'm pretty sure I'd just
    make it worse.

    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

    diff -r a38b5b461807 arch/i386/kernel/vmlinux.lds.S
    --- a/arch/i386/kernel/vmlinux.lds.S Thu Mar 22 19:28:55 2007 +1100
    +++ b/arch/i386/kernel/vmlinux.lds.S Thu Mar 22 20:12:26 2007 +1100
    @@ -145,12 +145,7 @@ SECTIONS
    *(.init.text)
    _einittext = .;
    }
    - .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
    - *(.init.data)
    - __start_paravirtprobe = .;
    - *(.paravirtprobe)
    - __stop_paravirtprobe = .;
    - }
    + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) }
    . = ALIGN(16);
    .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
    __setup_start = .;
    @@ -178,6 +173,11 @@ SECTIONS
    *(.altinstr_replacement)
    }
    . = ALIGN(4);
    + .paravirtprobe : AT(ADDR(.paravirtprobe) - LOAD_OFFSET) {
    + __start_paravirtprobe = .;
    + *(.paravirtprobe)
    + __stop_paravirtprobe = .;
    + }
    .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
    __start_parainstructions = .;
    *(.parainstructions)
    diff -r a38b5b461807 arch/i386/lguest/core.c
    --- a/arch/i386/lguest/core.c Thu Mar 22 19:28:55 2007 +1100
    +++ b/arch/i386/lguest/core.c Thu Mar 22 20:21:21 2007 +1100
    @@ -131,7 +131,7 @@ free_some_pages:
    return err;
    }

    -static __exit void unmap_hypervisor(void)
    +static void unmap_hypervisor(void)
    {
    unsigned int i;

    diff -r a38b5b461807 arch/i386/lguest/lg.h
    --- a/arch/i386/lguest/lg.h Thu Mar 22 19:28:55 2007 +1100
    +++ b/arch/i386/lguest/lg.h Thu Mar 22 20:20:15 2007 +1100
    @@ -38,7 +38,7 @@ struct lguest_regs
    u32 ss;
    };

    -__exit void free_pagetables(void);
    +void free_pagetables(void);
    __init int init_pagetables(struct page **hype_page, int pages);

    /* Full 4G segment descriptors, suitable for CS and DS. */
    diff -r a38b5b461807 arch/i386/lguest/lguest.c
    --- a/arch/i386/lguest/lguest.c Thu Mar 22 19:28:55 2007 +1100
    +++ b/arch/i386/lguest/lguest.c Thu Mar 22 20:40:22 2007 +1100
    @@ -550,7 +550,7 @@ static __attribute_used__ __init void lg
    start_kernel();
    }

    -asm(".section .init.text\n"
    +asm(".pushsection .init.text,\"ax\",@progbits\n"
    "lguest_maybe_init:\n"
    " cmpl $"__stringify(LGUEST_MAGIC_EBP)", %ebp\n"
    " jne 1f\n"
    @@ -558,6 +558,7 @@ asm(".section .init.text\n"
    " jne 1f\n"
    " cmpl $"__stringify(LGUEST_MAGIC_ESI)", %esi\n"
    " je lguest_init\n"
    - "1: ret");
    + "1: ret\n"
    + ".popsection");
    extern void asmlinkage lguest_maybe_init(void);
    paravirt_probe(lguest_maybe_init);
    diff -r a38b5b461807 arch/i386/lguest/page_tables.c
    --- a/arch/i386/lguest/page_tables.c Thu Mar 22 19:28:55 2007 +1100
    +++ b/arch/i386/lguest/page_tables.c Thu Mar 22 20:06:03 2007 +1100
    @@ -381,7 +381,7 @@ __init int init_pagetables(struct page *
    return 0;
    }

    -__exit void free_pagetables(void)
    +void free_pagetables(void)
    {
    free_hypervisor_pte_pages();
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-22 11:13    [W:0.025 / U:0.856 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site