Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index 5043702..857e891 100644 (file)
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -89,15 +89,15 @@ unsigned long       top_of_ram;
 
 void show_mem(void)
 {
-       int total = 0, reserved = 0;
-       int shared = 0, cached = 0;
+       unsigned long total = 0, reserved = 0;
+       unsigned long shared = 0, cached = 0;
        struct page *page;
        pg_data_t *pgdat;
        unsigned long i;
 
        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) {
                for (i = 0; i < pgdat->node_spanned_pages; i++) {
                        page = pgdat->node_mem_map + i;
@@ -110,10 +110,10 @@ void show_mem(void)
                                shared += page_count(page) - 1;
                }
        }
-       printk("%d pages of RAM\n",total);
-       printk("%d reserved pages\n",reserved);
-       printk("%d pages shared\n",shared);
-       printk("%d pages swap cached\n",cached);
+       printk("%ld pages of RAM\n", total);
+       printk("%ld reserved pages\n", reserved);
+       printk("%ld pages shared\n", shared);
+       printk("%ld pages swap cached\n", cached);
 }
 
 #ifdef CONFIG_PPC_ISERIES