Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55281de authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

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: default avatarJohannes Weiner <hannes@saeurebad.de>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 03da6bfb

arch/s390/mm/init.c

+0 −32
Original line number Original line Diff line number Diff line
@@ -42,38 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 
pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));

pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));

char  empty_zero_page[PAGE_SIZE] __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

 * paging_init() sets up the page tables

 */

 */