lkml.org 
[lkml]   [2008]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: fix section mismatch warning in topology.c
    Date
    Fix following warning:
    WARNING: arch/x86/kernel/built-in.o(__ksymtab+0x2b0): Section mismatch: reference to .cpuinit.text:arch_register_cpu in '__ksymtab_arch_register_cpu'

    Annotating exported symbols are wrong.
    Previously the warning were hidden by avoiding the export
    in the non HOTPLUG_CPU case but the improved checks in
    modpost caught it anyway.
    Fix it by removing the __cpuinit annotation and rearrange the
    code a bit to save one ifdef/endif pair.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    ---
    arch/x86/kernel/topology.c | 15 +++++++++------
    1 files changed, 9 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
    index a0d1719..78cbb65 100644
    --- a/arch/x86/kernel/topology.c
    +++ b/arch/x86/kernel/topology.c
    @@ -33,7 +33,8 @@

    static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);

    -int __cpuinit arch_register_cpu(int num)
    +#ifdef CONFIG_HOTPLUG_CPU
    +int arch_register_cpu(int num)
    {
    /*
    * CPU0 cannot be offlined due to several
    @@ -44,21 +45,23 @@ int __cpuinit arch_register_cpu(int num)
    * Also certain PCI quirks require not to enable hotplug control
    * for all CPU's.
    */
    -#ifdef CONFIG_HOTPLUG_CPU
    if (num)
    per_cpu(cpu_devices, num).cpu.hotpluggable = 1;
    -#endif
    -
    return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
    }
    +EXPORT_SYMBOL(arch_register_cpu);

    -#ifdef CONFIG_HOTPLUG_CPU
    void arch_unregister_cpu(int num)
    {
    return unregister_cpu(&per_cpu(cpu_devices, num).cpu);
    }
    -EXPORT_SYMBOL(arch_register_cpu);
    EXPORT_SYMBOL(arch_unregister_cpu);
    +#else
    +int arch_register_cpu(int num)
    +{
    + return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
    +}
    +EXPORT_SYMBOL(arch_register_cpu);
    #endif /*CONFIG_HOTPLUG_CPU*/

    static int __init topology_init(void)
    --
    1.5.4.rc3.14.g44397


    \
     
     \ /
      Last update: 2008-01-26 23:17    [W:0.023 / U:0.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site