[PATCH] i386: clean up topology.c
authorMagnus Damm <magnus@valinux.co.jp>
Tue, 26 Sep 2006 08:52:35 +0000 (10:52 +0200)
committerAndi Kleen <andi@basil.nowhere.org>
Tue, 26 Sep 2006 08:52:35 +0000 (10:52 +0200)
There is no need to duplicate the topology_init() function.

Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
Signed-off-by: Andi Kleen <ak@suse.de>
arch/i386/kernel/topology.c

index e2e281d4bcc80ee7bc3b090e75914606231e6224..07d6da36a8253f39bbce04e90ab4edc0ece8aed4 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/nodemask.h>
+#include <linux/mmzone.h>
 #include <asm/cpu.h>
 
 static struct i386_cpu cpu_devices[NR_CPUS];
@@ -55,34 +56,18 @@ EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);
 #endif /*CONFIG_HOTPLUG_CPU*/
 
-
-
-#ifdef CONFIG_NUMA
-#include <linux/mmzone.h>
-
 static int __init topology_init(void)
 {
        int i;
 
+#ifdef CONFIG_NUMA
        for_each_online_node(i)
                register_one_node(i);
+#endif /* CONFIG_NUMA */
 
        for_each_present_cpu(i)
                arch_register_cpu(i);
        return 0;
 }
 
-#else /* !CONFIG_NUMA */
-
-static int __init topology_init(void)
-{
-       int i;
-
-       for_each_present_cpu(i)
-               arch_register_cpu(i);
-       return 0;
-}
-
-#endif /* CONFIG_NUMA */
-
 subsys_initcall(topology_init);