lkml.org 
[lkml]   [2008]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 15/20] s390: 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>
    Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    ---
    arch/s390/Kconfig | 1 +
    arch/s390/mm/init.c | 32 --------------------------------
    2 files changed, 1 insertion(+), 32 deletions(-)

    --- a/arch/s390/Kconfig
    +++ b/arch/s390/Kconfig
    @@ -73,6 +73,7 @@ config S390
    select HAVE_OPROFILE
    select HAVE_KPROBES
    select HAVE_KRETPROBES
    + select HAVE_GENERIC_SHOW_MEM
    select HAVE_KVM if 64BIT

    source "init/Kconfig"
    --- a/arch/s390/mm/init.c
    +++ b/arch/s390/mm/init.c
    @@ -42,38 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga
    pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
    char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));

    -void show_mem(void)
    -{
    - unsigned long i, total = 0, reserved = 0;
    - unsigned long shared = 0, cached = 0;
    - unsigned long flags;
    - struct page *page;
    - pg_data_t *pgdat;
    -
    - printk("Mem-info:\n");
    - show_free_areas();
    - for_each_online_pgdat(pgdat) {
    - pgdat_resize_lock(pgdat, &flags);
    - for (i = 0; i < pgdat->node_spanned_pages; i++) {
    - if (!pfn_valid(pgdat->node_start_pfn + i))
    - continue;
    - page = pfn_to_page(pgdat->node_start_pfn + i);
    - total++;
    - 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);
    - printk("%ld reserved pages\n", reserved);
    - printk("%ld pages shared\n", shared);
    - printk("%ld pages swap cached\n", cached);
    -}
    -
    /*
    * paging_init() sets up the page tables
    */
    --



    \
     
     \ /
      Last update: 2008-06-27 14:19    [W:0.024 / U:0.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site