lkml.org 
[lkml]   [2008]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 22/22] alpha: Use generic show_mem()
    Date

    Signed-off-by: Johannes Weiner <hannes@saeurebad.de>

    diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
    index efffa92..c91629f 100644
    --- a/arch/alpha/Kconfig
    +++ b/arch/alpha/Kconfig
    @@ -598,9 +598,6 @@ config ALPHA_LARGE_VMALLOC

    Say N unless you know you need gobs and gobs of vmalloc space.

    -config HAVE_ARCH_SHOW_MEM
    - def_bool y
    -
    config VERBOSE_MCHECK
    bool "Verbose Machine Checks"

    @@ -679,4 +676,3 @@ source "security/Kconfig"
    source "crypto/Kconfig"

    source "lib/Kconfig"
    -
    diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
    index 40c15e7..234e42b 100644
    --- a/arch/alpha/mm/init.c
    +++ b/arch/alpha/mm/init.c
    @@ -94,36 +94,6 @@ __bad_page(void)
    return pte_mkdirty(mk_pte(virt_to_page(EMPTY_PGE), PAGE_SHARED));
    }

    -#ifndef CONFIG_DISCONTIGMEM
    -void
    -show_mem(void)
    -{
    - long i,free = 0,total = 0,reserved = 0;
    - long shared = 0, cached = 0;
    -
    - printk("\nMem-info:\n");
    - show_free_areas();
    - printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
    - 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("%ld pages of RAM\n",total);
    - printk("%ld free pages\n",free);
    - printk("%ld reserved pages\n",reserved);
    - printk("%ld pages shared\n",shared);
    - printk("%ld pages swap cached\n",cached);
    -}
    -#endif
    -
    static inline unsigned long
    load_PCB(struct pcb_struct *pcb)
    {
    diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
    index 10ab783..a460645 100644
    --- a/arch/alpha/mm/numa.c
    +++ b/arch/alpha/mm/numa.c
    @@ -359,38 +359,3 @@ void __init mem_init(void)
    mem_stress();
    #endif
    }
    -
    -void
    -show_mem(void)
    -{
    - long i,free = 0,total = 0,reserved = 0;
    - long shared = 0, cached = 0;
    - int nid;
    -
    - printk("\nMem-info:\n");
    - show_free_areas();
    - printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
    - for_each_online_node(nid) {
    - unsigned long flags;
    - pgdat_resize_lock(NODE_DATA(nid), &flags);
    - i = node_spanned_pages(nid);
    - while (i-- > 0) {
    - struct page *page = nid_page_nr(nid, i);
    - total++;
    - if (PageReserved(page))
    - reserved++;
    - else if (PageSwapCache(page))
    - cached++;
    - else if (!page_count(page))
    - free++;
    - else
    - shared += page_count(page) - 1;
    - }
    - pgdat_resize_unlock(NODE_DATA(nid), &flags);
    - }
    - printk("%ld pages of RAM\n",total);
    - printk("%ld free pages\n",free);
    - printk("%ld reserved pages\n",reserved);
    - printk("%ld pages shared\n",shared);
    - printk("%ld pages swap cached\n",cached);
    -}
    --
    1.5.2.2


    \
     
     \ /
      Last update: 2008-04-02 23:55    [W:0.023 / U:31.756 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site