vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / kernel / numaq.c

diff --git a/arch/i386/kernel/numaq.c b/arch/i386/kernel/numaq.c
index ed41eeb..0ee22fc 100644 (file)
--- a/arch/i386/kernel/numaq.c
+++ b/arch/i386/kernel/numaq.c
@@ -28,6 +28,7 @@
 #include <linux/bootmem.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
+#include <linux/nodemask.h>
 #include <asm/numaq.h>
 
 /* These are needed before the pgdat's are created */
@@ -39,8 +40,7 @@ extern long node_start_pfn[], node_end_pfn[];
  * Function: smp_dump_qct()
  *
  * Description: gets memory layout from the quad config table.  This
- * function also increments numnodes with the number of nodes (quads)
- * present.
+ * function also updates node_online_map with the nodes (quads) present.
  */
 static void __init smp_dump_qct(void)
 {
@@ -49,11 +49,10 @@ static void __init smp_dump_qct(void)
        struct sys_cfg_data *scd =
                (struct sys_cfg_data *)__va(SYS_CFG_DATA_PRIV_ADDR);
 
-       numnodes = 0;
-       for(node = 0; node < MAX_NUMNODES; node++) {
-               if(scd->quads_present31_0 & (1 << node)) {
+       nodes_clear(node_online_map);
+       for_each_node(node) {
+               if (scd->quads_present31_0 & (1 << node)) {
                        node_set_online(node);
-                       numnodes++;
                        eq = &scd->eq[node];
                        /* Convert to pages */
                        node_start_pfn[node] = MB_TO_PAGES(