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

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

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index d02ee45..3ea81ca 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -106,7 +106,7 @@ show_mem(void)
 
        printk("\nMem-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));
        i = max_mapnr;
        while (i-- > 0) {
                total++;
@@ -117,7 +117,7 @@ show_mem(void)
                else if (!page_count(mem_map+i))
                        free++;
                else
-                       shared += atomic_read(&mem_map[i].count) - 1;
+                       shared += page_count(mem_map + i) - 1;
        }
        printk("%ld pages of RAM\n",total);
        printk("%ld free pages\n",free);
@@ -152,9 +152,9 @@ switch_to_system_map(void)
 
        /* Set the vptb.  This is often done by the bootloader, but 
           shouldn't be required.  */
-       if (hwrpb->vptb != 0xfffffffe00000000) {
-               wrvptptr(0xfffffffe00000000);
-               hwrpb->vptb = 0xfffffffe00000000;
+       if (hwrpb->vptb != 0xfffffffe00000000UL) {
+               wrvptptr(0xfffffffe00000000UL);
+               hwrpb->vptb = 0xfffffffe00000000UL;
                hwrpb_update_checksum(hwrpb);
        }
 
@@ -301,8 +301,8 @@ srm_paging_stop (void)
        /* Move the vptb back to where the SRM console expects it.  */
        swapper_pg_dir[1] = swapper_pg_dir[1023];
        tbia();
-       wrvptptr(0x200000000);
-       hwrpb->vptb = 0x200000000;
+       wrvptptr(0x200000000UL);
+       hwrpb->vptb = 0x200000000UL;
        hwrpb_update_checksum(hwrpb);
 
        /* Reload the page tables that the console had in use.  */