Commit:     d987402695f16ae33999d7315b915099d64616d4
Parent:     93809be8b140c101d27f00d0a622ebac90bc7a67
Author:     Alexander van Heukelum <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 1 17:49:43 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 17:49:43 2008 +0100

    x86: avoid section mismatch involving arch_register_cpu
    Avoid section mismatch involving arch_register_cpu.
    Marking arch_register_cpu as __init and removing the export
    for non-hotplug-cpu configurations makes the following warning
    go away:
    Section mismatch in reference from the function
    arch_register_cpu() to the function .devinit.text:register_cpu()
    The function  arch_register_cpu() references
    the function __devinit register_cpu().
    This is often because arch_register_cpu lacks a __devinit
    annotation or the annotation of register_cpu is wrong.
    The only external user of arch_register_cpu in the tree is
    in drivers/acpi/processor_core.c where it is guarded by
    ACPI_HOTPLUG_CPU (which depends on HOTPLUG_CPU).
    Signed-off-by: Alexander van Heukelum <[EMAIL PROTECTED]>
    CC: Sam Ravnborg <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
 arch/x86/kernel/topology.c |    3 +--
 include/asm-x86/cpu.h      |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 78cbb65..e6757aa 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -57,11 +57,10 @@ void arch_unregister_cpu(int num)
-int arch_register_cpu(int num)
+static int __init arch_register_cpu(int num)
        return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
 static int __init topology_init(void)
diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h
index 85ece5f..73f2ea8 100644
--- a/include/asm-x86/cpu.h
+++ b/include/asm-x86/cpu.h
@@ -10,8 +10,9 @@
 struct x86_cpu {
        struct cpu cpu;
-extern int arch_register_cpu(int num);
+extern int arch_register_cpu(int num);
 extern void arch_unregister_cpu(int);
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

Reply via email to