Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3eaf5efae72b33bc6132e9590e5d4bf11532f8c4
Commit:     3eaf5efae72b33bc6132e9590e5d4bf11532f8c4
Parent:     1e296f578a8ef70b314315a2bfc7b036f947803f
Author:     Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:37 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:37 2008 +0100

    x86: fix section mismatch warning in topology.c
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to