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 15/22] powerpc: Use generic show_mem()
    Date

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

    diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
    index 8950e0c..1189d8d 100644
    --- a/arch/powerpc/Kconfig
    +++ b/arch/powerpc/Kconfig
    @@ -350,9 +350,6 @@ config ARCH_SPARSEMEM_DEFAULT
    config ARCH_POPULATES_NODE_MAP
    def_bool y

    -config HAVE_ARCH_SHOW_MEM
    - def_bool y
    -
    source "mm/Kconfig"

    config ARCH_MEMORY_PROBE
    diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
    index be5c506..fcbae37 100644
    --- a/arch/powerpc/mm/mem.c
    +++ b/arch/powerpc/mm/mem.c
    @@ -164,46 +164,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,

    #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();
    - printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
    - 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
    --
    1.5.2.2


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