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

Commit df849a15 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] zoned vm counters: conversion of nr_pagetables to per zone counter 



Conversion of nr_page_table_pages to a per zone counter

[akpm@osdl.org: bugfix]
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a865ffa

arch/arm/mm/mm-armv.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void free_pgd_slow(pgd_t *pgd) 


	pte = pmd_page(*pmd);

	pmd_clear(pmd);

	dec_page_state(nr_page_table_pages);

	dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);

	pte_lock_deinit(pte);

	pte_free(pte);

	pmd_free(pmd);

arch/i386/mm/pgtable.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ void show_mem(void) 
	printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);

	printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));

	printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB));

	printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);

	printk(KERN_INFO "%lu pages pagetables\n",

					global_page_state(NR_PAGETABLE));

}



/*

arch/um/kernel/skas/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ void destroy_context_skas(struct mm_struct *mm) 
		free_page(mmu->id.stack);

		pte_lock_deinit(virt_to_page(mmu->last_page_table));

		pte_free_kernel((pte_t *) mmu->last_page_table);

                dec_page_state(nr_page_table_pages);

		dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE);

#ifdef CONFIG_3_LEVEL_PGTABLES

		pmd_free((pmd_t *) mmu->last_pmd);

#endif

drivers/base/node.c

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       "Node %d FilePages:    %8lu kB\n"

		       "Node %d Mapped:       %8lu kB\n"

		       "Node %d AnonPages:    %8lu kB\n"

		       "Node %d PageTables:   %8lu kB\n"

		       "Node %d Slab:         %8lu kB\n",

		       nid, K(i.totalram),

		       nid, K(i.freeram),
@@ -85,6 +86,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(node_page_state(nid, NR_ANON_PAGES)),

		       nid, K(node_page_state(nid, NR_PAGETABLE)),

		       nid, K(node_page_state(nid, NR_SLAB)));

	n += hugetlb_report_node_meminfo(nid, buf + n);

	return n;

fs/proc/proc_misc.c

+2 −2
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		"AnonPages:    %8lu kB\n"

		"Mapped:       %8lu kB\n"

		"Slab:         %8lu kB\n"

		"PageTables:   %8lu kB\n"

		"CommitLimit:  %8lu kB\n"

		"Committed_AS: %8lu kB\n"

		"PageTables:   %8lu kB\n"

		"VmallocTotal: %8lu kB\n"

		"VmallocUsed:  %8lu kB\n"

		"VmallocChunk: %8lu kB\n",
@@ -195,9 +195,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		K(global_page_state(NR_ANON_PAGES)),

		K(global_page_state(NR_FILE_MAPPED)),

		K(global_page_state(NR_SLAB)),

		K(global_page_state(NR_PAGETABLE)),

		K(allowed),

		K(committed),

		K(ps.nr_page_table_pages),

		(unsigned long)VMALLOC_TOTAL >> 10,

		vmi.used >> 10,

		vmi.largest_chunk >> 10