lkml.org 
[lkml]   [2008]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 12/22 -v2] mips: Use generic show_mem()
    Remove arch-specific show_mem() in favor of the generic version. 

    This also removes the following redundant information display:

    - pages in swapcache, printed by show_swap_cache_info()

    where show_mem() calls show_free_areas(), which calls
    show_swap_cache_info().

    And show_mem() does now actually print something on configurations
    with multiple nodes.

    Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
    Acked-by: Ralf Baechle <ralf@linux-mips.org>
    ---

    Index: tree-linus/arch/mips/Kconfig
    ===================================================================
    --- tree-linus.orig/arch/mips/Kconfig
    +++ tree-linus/arch/mips/Kconfig
    @@ -6,7 +6,6 @@ config MIPS
    # Horrible source of confusion. Die, die, die ...
    select EMBEDDED
    select RTC_LIB
    - select HAVE_ARCH_SHOW_MEM

    mainmenu "Linux/MIPS Kernel Configuration"

    Index: tree-linus/arch/mips/mm/Makefile
    ===================================================================
    --- tree-linus.orig/arch/mips/mm/Makefile
    +++ tree-linus/arch/mips/mm/Makefile
    @@ -3,8 +3,7 @@
    #

    obj-y += cache.o dma-default.o extable.o fault.o \
    - init.o pgtable.o tlbex.o tlbex-fault.o \
    - uasm.o
    + init.o tlbex.o tlbex-fault.o uasm.o

    obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
    obj-$(CONFIG_64BIT) += pgtable-64.o
    Index: tree-linus/arch/mips/mm/pgtable.c
    ===================================================================
    --- tree-linus.orig/arch/mips/mm/pgtable.c
    +++ /dev/null
    @@ -1,36 +0,0 @@
    -#include <linux/kernel.h>
    -#include <linux/mm.h>
    -#include <linux/swap.h>
    -
    -void show_mem(void)
    -{
    -#ifndef CONFIG_NEED_MULTIPLE_NODES /* XXX(hch): later.. */
    - int pfn, total = 0, reserved = 0;
    - int shared = 0, cached = 0;
    - int highmem = 0;
    - struct page *page;
    -
    - printk("Mem-info:\n");
    - show_free_areas();
    - pfn = max_mapnr;
    - while (pfn-- > 0) {
    - if (!pfn_valid(pfn))
    - continue;
    - page = pfn_to_page(pfn);
    - total++;
    - if (PageHighMem(page))
    - highmem++;
    - if (PageReserved(page))
    - reserved++;
    - else if (PageSwapCache(page))
    - cached++;
    - else if (page_count(page))
    - shared += page_count(page) - 1;
    - }
    - printk("%d pages of RAM\n", total);
    - printk("%d pages of HIGHMEM\n", highmem);
    - printk("%d reserved pages\n", reserved);
    - printk("%d pages shared\n", shared);
    - printk("%d pages swap cached\n", cached);
    -#endif
    -}
    --



    \
     
     \ /
      Last update: 2008-04-04 15:07    [W:0.049 / U:30.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site