lkml.org 
[lkml]   [2008]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 14/22 -v3] powerpc: 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().

    Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
    CC: Paul Mackerras <paulus@samba.org>
    ---

    Index: tree-linus/arch/powerpc/Kconfig
    ===================================================================
    --- tree-linus.orig/arch/powerpc/Kconfig
    +++ tree-linus/arch/powerpc/Kconfig
    @@ -91,6 +91,7 @@ config PPC
    select HAVE_OPROFILE
    select HAVE_KPROBES
    select HAVE_KRETPROBES
    + select HAVE_GENERIC_SHOW_MEM

    config EARLY_PRINTK
    bool
    Index: tree-linus/arch/powerpc/mm/mem.c
    ===================================================================
    --- tree-linus.orig/arch/powerpc/mm/mem.c
    +++ tree-linus/arch/powerpc/mm/mem.c
    @@ -164,45 +164,6 @@ walk_memory_resource(unsigned long start

    #endif /* CONFIG_MEMORY_HOTPLUG */

    -void show_mem(void)
    -{
    - unsigned long total = 0, reserved = 0;
    - unsigned long shared = 0, cached = 0;
    - unsigned long highmem = 0;
    - struct page *page;
    - pg_data_t *pgdat;
    - unsigned long i;
    -
    - printk("Mem-info:\n");
    - show_free_areas();
    - for_each_online_pgdat(pgdat) {
    - unsigned long flags;
    - pgdat_resize_lock(pgdat, &flags);
    - for (i = 0; i < pgdat->node_spanned_pages; i++) {
    - if (!pfn_valid(pgdat->node_start_pfn + i))
    - continue;
    - page = pgdat_page_nr(pgdat, i);
    - total++;
    - if (PageHighMem(page))
    - highmem++;
    - if (PageReserved(page))
    - reserved++;
    - else if (PageSwapCache(page))
    - cached++;
    - else if (page_count(page))
    - shared += page_count(page) - 1;
    - }
    - pgdat_resize_unlock(pgdat, &flags);
    - }
    - printk("%ld pages of RAM\n", total);
    -#ifdef CONFIG_HIGHMEM
    - printk("%ld pages of HIGHMEM\n", highmem);
    -#endif
    - printk("%ld reserved pages\n", reserved);
    - printk("%ld pages shared\n", shared);
    - printk("%ld pages swap cached\n", cached);
    -}
    -
    /*
    * Initialize the bootmem system and give it all the memory we
    * have available. If we are using highmem, we only put the
    --



    \
     
     \ /
      Last update: 2008-04-07 17:57    [W:0.035 / U:31.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site