vserver 1.9.3

[linux-2.6.git] / arch / arm26 / mm / init.c

diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index a4f56b2..17f7dc3 100644 (file)
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -67,7 +67,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));
 
 
        page = NODE_MEM_MAP(0);
@@ -305,8 +305,8 @@ void __init paging_init(struct meminfo *mi)
                        (bdata->node_boot_start >> PAGE_SHIFT);
        if (!zone_size[0])
                BUG();
-
-       free_area_init_node(0, pgdat, 0, zone_size,
+       pgdat->node_mem_map = NULL;
+       free_area_init_node(0, pgdat, zone_size,
                        bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
 
        mem_map = NODE_DATA(0)->node_mem_map;
@@ -376,7 +376,7 @@ void __init mem_init(void)
         * Turn on overcommit on tiny machines
         */
        if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
-               sysctl_overcommit_memory = 1;
+               sysctl_overcommit_memory = OVERCOMMIT_ALWAYS;
                printk("Turning on overcommit\n");
        }
 }