2008-06-27 12:14:51

by Johannes Weiner

Subject: [PATCH 09/20] 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 <[email protected]>
CC: Geert Uytterhoeven <[email protected]>
---
arch/m68k/Kconfig | 1 +
arch/m68k/mm/init.c | 30 ------------------------------
2 files changed, 1 insertion(+), 30 deletions(-)

--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -6,6 +6,7 @@ config M68K
bool
default y
select HAVE_IDE
+ select HAVE_GENERIC_SHOW_MEM

config MMU
bool
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -69,36 +69,6 @@ void __init m68k_setup_node(int node)
void *empty_zero_page;
EXPORT_SYMBOL(empty_zero_page);

-void show_mem(void)
-{
- pg_data_t *pgdat;
- int free = 0, total = 0, reserved = 0, shared = 0;
- int cached = 0;
- int i;
-
- printk("\nMem-info:\n");
- show_free_areas();
- for_each_online_pgdat(pgdat) {
- for (i = 0; i < pgdat->node_spanned_pages; i++) {
- struct page *page = pgdat->node_mem_map + i;
- total++;
- if (PageReserved(page))
- reserved++;
- else if (PageSwapCache(page))
- cached++;
- else if (!page_count(page))
- free++;
- else
- shared += page_count(page) - 1;
- }
- }
- printk("%d pages of RAM\n",total);
- printk("%d free pages\n",free);
- printk("%d reserved pages\n",reserved);
- printk("%d pages shared\n",shared);
- printk("%d pages swap cached\n",cached);
-}
-
extern void init_pointer_table(unsigned long ptable);

/* References to section boundaries */

--

2008-06-29 09:17:21

by Geert Uytterhoeven

Subject: Re: [PATCH 09/20] m68k: use generic show_mem()

On Fri, 27 Jun 2008, Johannes Weiner wrote:
> 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 <[email protected]>
> CC: Geert Uytterhoeven <[email protected]>

Acked-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds