vserver 1.9.5.x5

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

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index 1d61ed4..5249a37 100644 (file)
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -76,7 +76,7 @@ void show_mem(void)
 {
        printk("Mem-info:\n");
        show_free_areas();
-       printk("Free swap:       %6dkB\n",
+       printk("Free swap:       %6ldkB\n",
               nr_swap_pages << (PAGE_SHIFT-10));
        printk("%ld pages of RAM\n", totalram_pages);
        printk("%d free pages\n", nr_free_pages());
@@ -100,7 +100,7 @@ void __init sparc_context_init(int numctx)
 
                clist = (ctx_list_pool + ctx);
                clist->ctx_number = ctx;
-               clist->ctx_mm = 0;
+               clist->ctx_mm = NULL;
        }
        ctx_free.next = ctx_free.prev = &ctx_free;
        ctx_used.next = ctx_used.prev = &ctx_used;
@@ -402,8 +402,6 @@ void __init mem_init(void)
        int reservedpages = 0;
        int i;
 
-       highmem_start_page = pfn_to_page(highstart_pfn);
-
        if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
                prom_printf("BUG: fixmap and pkmap areas overlap\n");
                prom_printf("pkbase: 0x%lx pkend: 0x%lx fixstart 0x%lx\n",