Commit e92343cc authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86-64: Fix show_mem a little bit

- Add KERN_INFO to printks (from i386)
- Use longs instead of ints to accumulate pages.
- Fix broken indenting.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 083044e6
...@@ -57,31 +57,31 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); ...@@ -57,31 +57,31 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
void show_mem(void) void show_mem(void)
{ {
int i, total = 0, reserved = 0; long i, total = 0, reserved = 0;
int shared = 0, cached = 0; long shared = 0, cached = 0;
pg_data_t *pgdat; pg_data_t *pgdat;
struct page *page; struct page *page;
printk("Mem-info:\n"); printk(KERN_INFO "Mem-info:\n");
show_free_areas(); show_free_areas();
printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_pgdat(pgdat) { for_each_pgdat(pgdat) {
for (i = 0; i < pgdat->node_spanned_pages; ++i) { for (i = 0; i < pgdat->node_spanned_pages; ++i) {
page = pfn_to_page(pgdat->node_start_pfn + i); page = pfn_to_page(pgdat->node_start_pfn + i);
total++; total++;
if (PageReserved(page)) if (PageReserved(page))
reserved++; reserved++;
else if (PageSwapCache(page)) else if (PageSwapCache(page))
cached++; cached++;
else if (page_count(page)) else if (page_count(page))
shared += page_count(page) - 1; shared += page_count(page) - 1;
} }
} }
printk("%d pages of RAM\n", total); printk(KERN_INFO "%lu pages of RAM\n", total);
printk("%d reserved pages\n",reserved); printk(KERN_INFO "%lu reserved pages\n",reserved);
printk("%d pages shared\n",shared); printk(KERN_INFO "%lu pages shared\n",shared);
printk("%d pages swap cached\n",cached); printk(KERN_INFO "%lu pages swap cached\n",cached);
} }
/* References to section boundaries */ /* References to section boundaries */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment