VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / ia64 / mm / discontig.c

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 751af13..23a9490 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -154,6 +154,9 @@ static void __init reassign_cpu_only_nodes(void)
 
        memcpy(numa_slit, numa_slit_fix, sizeof (numa_slit));
 
+       for (i = nnode; i < numnodes; i++)
+               node_set_offline(i);
+
        numnodes = nnode;
 
        return;
@@ -495,7 +498,7 @@ void show_mem(void)
 
        printk("Mem-info:\n");
        show_free_areas();
-       printk("Free swap:       %6dkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
+       printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
        for_each_pgdat(pgdat) {
                printk("Node ID: %d\n", pgdat->node_id);
                for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -546,7 +549,7 @@ void call_pernode_memory(unsigned long start, unsigned long len, void *arg)
        if (!num_node_memblks) {
                /* No SRAT table, so assume one node (node 0) */
                if (start < end)
-                       (*func)(start, len, 0);
+                       (*func)(start, end - start, 0);
                return;
        }