2008-07-04 16:57:48

by Johannes Weiner

[permalink] [raw]
Subject: [PATCH 16/20] m68knommu: 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/m68knommu/mm/init.c | 27 ---------------------------
1 file changed, 27 deletions(-)

--- a/arch/m68knommu/mm/init.c
+++ b/arch/m68knommu/mm/init.c
@@ -62,33 +62,6 @@ static unsigned long empty_bad_page;

unsigned long empty_zero_page;

-void show_mem(void)
-{
- unsigned long i;
- int free = 0, total = 0, reserved = 0, shared = 0;
- int cached = 0;
-
- printk(KERN_INFO "\nMem-info:\n");
- show_free_areas();
- i = max_mapnr;
- while (i-- > 0) {
- total++;
- if (PageReserved(mem_map+i))
- reserved++;
- else if (PageSwapCache(mem_map+i))
- cached++;
- else if (!page_count(mem_map+i))
- free++;
- else
- shared += page_count(mem_map+i) - 1;
- }
- printk(KERN_INFO "%d pages of RAM\n",total);
- printk(KERN_INFO "%d free pages\n",free);
- printk(KERN_INFO "%d reserved pages\n",reserved);
- printk(KERN_INFO "%d pages shared\n",shared);
- printk(KERN_INFO "%d pages swap cached\n",cached);
-}
-
extern unsigned long memory_start;
extern unsigned long memory_end;


--


2008-07-05 08:11:46

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH 16/20] m68knommu: use generic show_mem()

On Fri, 4 Jul 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]>
> ---
> arch/m68knommu/mm/init.c | 27 ---------------------------

m68knommu is uClinux.

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

2008-07-05 11:32:15

by Johannes Weiner

[permalink] [raw]
Subject: Re: [PATCH 16/20] m68knommu: use generic show_mem()

Hi,

Geert Uytterhoeven <[email protected]> writes:

> On Fri, 4 Jul 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]>
>> ---
>> arch/m68knommu/mm/init.c | 27 ---------------------------
>
> m68knommu is uClinux.

Uhm, I can not quite follow you here. Is the CC wrong?

Hannes

2008-07-05 12:12:22

by Johannes Weiner

[permalink] [raw]
Subject: Re: [PATCH 16/20] m68knommu: use generic show_mem()

Johannes Weiner <[email protected]> writes:

> Hi,
>
> Geert Uytterhoeven <[email protected]> writes:
>
>> On Fri, 4 Jul 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]>
>>> ---
>>> arch/m68knommu/mm/init.c | 27 ---------------------------
>>
>> m68knommu is uClinux.
>
> Uhm, I can not quite follow you here. Is the CC wrong?

Nevermind, just noticed that you added the ucl list to cc.

Hannes

2008-07-06 03:36:34

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH 16/20] m68knommu: use generic show_mem()


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: Greg Ungerer <[email protected]>



> ---
> arch/m68knommu/mm/init.c | 27 ---------------------------
> 1 file changed, 27 deletions(-)
>
> --- a/arch/m68knommu/mm/init.c
> +++ b/arch/m68knommu/mm/init.c
> @@ -62,33 +62,6 @@ static unsigned long empty_bad_page;
>
> unsigned long empty_zero_page;
>
> -void show_mem(void)
> -{
> - unsigned long i;
> - int free = 0, total = 0, reserved = 0, shared = 0;
> - int cached = 0;
> -
> - printk(KERN_INFO "\nMem-info:\n");
> - show_free_areas();
> - i = max_mapnr;
> - while (i-- > 0) {
> - total++;
> - if (PageReserved(mem_map+i))
> - reserved++;
> - else if (PageSwapCache(mem_map+i))
> - cached++;
> - else if (!page_count(mem_map+i))
> - free++;
> - else
> - shared += page_count(mem_map+i) - 1;
> - }
> - printk(KERN_INFO "%d pages of RAM\n",total);
> - printk(KERN_INFO "%d free pages\n",free);
> - printk(KERN_INFO "%d reserved pages\n",reserved);
> - printk(KERN_INFO "%d pages shared\n",shared);
> - printk(KERN_INFO "%d pages swap cached\n",cached);
> -}
> -
> extern unsigned long memory_start;
> extern unsigned long memory_end;
>

--
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [email protected]
Secure Computing Corporation PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com