Automatic merge with /usr/src/ntfs-2.6.git.

1 files changed, 7 insertions, 8 deletions

diff --git a/arch/i386/mach-default/topology.c b/arch/i386/mach-default/topology.c
index 5b3e8817dae8..23395fff35d1 100644
--- a/arch/i386/mach-default/topology.c
+++ b/arch/i386/mach-default/topology.c
@@ -73,12 +73,11 @@ static int __init topology_init(void)
 {
         int i;
 
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                if (node_online(i))
-                        arch_register_node(i);
-        }
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_possible(i)) arch_register_cpu(i);
+        for_each_online_node(i)
+                arch_register_node(i);
+
+        for_each_cpu(i)
+                arch_register_cpu(i);
         return 0;
 }
 
@@ -88,8 +87,8 @@ static int __init topology_init(void)
 {
         int i;
 
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_possible(i)) arch_register_cpu(i);
+        for_each_cpu(i)
+                arch_register_cpu(i);
         return 0;
 }