lkml.org 
[lkml]   [2012]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] Allow constructor name selection by architecture.
    Date
    From: Vincent Sanders <vince@collabora.co.uk>

    The constructor symbol name is different between platforms. Allow this
    to be selected by configuration and set suitable default values.

    Signed-off-by: Vincent Sanders <vincent.sanders@collabora.co.uk>
    ---
    include/asm-generic/vmlinux.lds.h | 6 +++---
    init/Kconfig | 6 ++++++
    kernel/module.c | 2 +-
    3 files changed, 10 insertions(+), 4 deletions(-)

    diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
    index 8aeadf6..fd34808 100644
    --- a/include/asm-generic/vmlinux.lds.h
    +++ b/include/asm-generic/vmlinux.lds.h
    @@ -471,9 +471,9 @@
    }

    #ifdef CONFIG_CONSTRUCTORS
    -#define KERNEL_CTORS() . = ALIGN(8); \
    - VMLINUX_SYMBOL(__ctors_start) = .; \
    - *(.ctors) \
    +#define KERNEL_CTORS() . = ALIGN(8); \
    + VMLINUX_SYMBOL(__ctors_start) = .; \
    + *(CONFIG_CONSTRUCTORS_NAME) \
    VMLINUX_SYMBOL(__ctors_end) = .;
    #else
    #define KERNEL_CTORS()
    diff --git a/init/Kconfig b/init/Kconfig
    index 6cfd71d..52181a1 100644
    --- a/init/Kconfig
    +++ b/init/Kconfig
    @@ -20,6 +20,12 @@ config CONSTRUCTORS
    bool
    depends on !UML

    +config CONSTRUCTORS_NAME
    + string
    + depends on CONSTRUCTORS
    + default ".init_array" if ARM && AEABI
    + default ".ctors"
    +
    config HAVE_IRQ_WORK
    bool

    diff --git a/kernel/module.c b/kernel/module.c
    index 78ac6ec..e5fad5e 100644
    --- a/kernel/module.c
    +++ b/kernel/module.c
    @@ -2600,7 +2600,7 @@ static void find_module_sections(struct module *mod, struct load_info *info)
    mod->unused_gpl_crcs = section_addr(info, "__kcrctab_unused_gpl");
    #endif
    #ifdef CONFIG_CONSTRUCTORS
    - mod->ctors = section_objs(info, ".ctors",
    + mod->ctors = section_objs(info, CONFIG_CONSTRUCTORS_NAME,
    sizeof(*mod->ctors), &mod->num_ctors);
    #endif

    --
    1.7.10


    \
     
     \ /
      Last update: 2012-05-28 21:21    [W:0.023 / U:64.904 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site