diff options
author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-25 22:46:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 15:00:11 -0400 |
commit | 969eefb516b71f8abadf5bc4861a672694f48c38 (patch) | |
tree | afe24478b2daf74668476e8db1e7f7230f04508d /arch/m68k | |
parent | 0ec5e0edd155385cb59cb9857de3176524ba4ff8 (diff) |
m68k: use generic show_mem()
Remove arch-specific show_mem() in favor of the generic version.
This also removes the following redundant information display:
- free pages, printed by show_free_areas()
- pages in swapcache, printed by show_swap_cache_info()
where show_mem() calls show_free_areas(), which calls
show_swap_cache_info().
Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/mm/init.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 79f5f94d4800..81bb08ceec18 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
@@ -69,36 +69,6 @@ void __init m68k_setup_node(int node) | |||
69 | void *empty_zero_page; | 69 | void *empty_zero_page; |
70 | EXPORT_SYMBOL(empty_zero_page); | 70 | EXPORT_SYMBOL(empty_zero_page); |
71 | 71 | ||
72 | void show_mem(void) | ||
73 | { | ||
74 | pg_data_t *pgdat; | ||
75 | int free = 0, total = 0, reserved = 0, shared = 0; | ||
76 | int cached = 0; | ||
77 | int i; | ||
78 | |||
79 | printk("\nMem-info:\n"); | ||
80 | show_free_areas(); | ||
81 | for_each_online_pgdat(pgdat) { | ||
82 | for (i = 0; i < pgdat->node_spanned_pages; i++) { | ||
83 | struct page *page = pgdat->node_mem_map + i; | ||
84 | total++; | ||
85 | if (PageReserved(page)) | ||
86 | reserved++; | ||
87 | else if (PageSwapCache(page)) | ||
88 | cached++; | ||
89 | else if (!page_count(page)) | ||
90 | free++; | ||
91 | else | ||
92 | shared += page_count(page) - 1; | ||
93 | } | ||
94 | } | ||
95 | printk("%d pages of RAM\n",total); | ||
96 | printk("%d free pages\n",free); | ||
97 | printk("%d reserved pages\n",reserved); | ||
98 | printk("%d pages shared\n",shared); | ||
99 | printk("%d pages swap cached\n",cached); | ||
100 | } | ||
101 | |||
102 | extern void init_pointer_table(unsigned long ptable); | 72 | extern void init_pointer_table(unsigned long ptable); |
103 | 73 | ||
104 | /* References to section boundaries */ | 74 | /* References to section boundaries */ |