The patch titled
zoned vm counters: conversion of nr_pagetable to per zone counter
has been added to the -mm tree. Its filename is
zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: zoned vm counters: conversion of nr_pagetable to per zone counter
From: Christoph Lameter <clameter@xxxxxxx>
Conversion of nr_page_table_pages to a per zone counter
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/pgtable.c | 2 +-
fs/proc/proc_misc.c | 2 +-
include/linux/mmzone.h | 1 +
include/linux/page-flags.h | 3 +--
mm/memory.c | 4 ++--
mm/page_alloc.c | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter arch/i386/mm/pgtable.c
--- devel/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/arch/i386/mm/pgtable.c 2006-06-09 02:49:41.000000000 -0700
@@ -63,7 +63,7 @@ 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_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));
}
/*
diff -puN fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter fs/proc/proc_misc.c
--- devel/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/fs/proc/proc_misc.c 2006-06-09 02:49:41.000000000 -0700
@@ -194,7 +194,7 @@ static int meminfo_read_proc(char *page,
K(global_page_state(NR_SLAB)),
K(allowed),
K(committed),
- K(ps.nr_page_table_pages),
+ K(global_page_state(NR_PAGETABLE)),
(unsigned long)VMALLOC_TOTAL >> 10,
vmi.used >> 10,
vmi.largest_chunk >> 10
diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter include/linux/mmzone.h
--- devel/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/include/linux/mmzone.h 2006-06-09 02:49:41.000000000 -0700
@@ -51,6 +51,7 @@ enum zone_stat_item {
only modified from process context */
NR_PAGECACHE, /* file backed pages */
NR_SLAB, /* used by slab allocator */
+ NR_PAGETABLE, /* used for pagetables */
NR_STAT_ITEMS };
#ifdef CONFIG_SMP
diff -puN include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter include/linux/page-flags.h
--- devel/include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 02:49:41.000000000 -0700
@@ -120,8 +120,7 @@ struct page_state {
unsigned long nr_dirty; /* Dirty writeable pages */
unsigned long nr_writeback; /* Pages under writeback */
unsigned long nr_unstable; /* NFS unstable pages */
- unsigned long nr_page_table_pages;/* Pages used for pagetables */
-#define GET_PAGE_STATE_LAST nr_page_table_pages
+#define GET_PAGE_STATE_LAST nr_unstable
/*
* The below are zeroed by get_page_state(). Use get_full_page_state()
diff -puN mm/memory.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter mm/memory.c
--- devel/mm/memory.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/mm/memory.c 2006-06-09 02:49:41.000000000 -0700
@@ -126,7 +126,7 @@ static void free_pte_range(struct mmu_ga
pmd_clear(pmd);
pte_lock_deinit(page);
pte_free_tlb(tlb, page);
- dec_page_state(nr_page_table_pages);
+ dec_zone_page_state(page, NR_PAGETABLE);
tlb->mm->nr_ptes--;
}
@@ -311,7 +311,7 @@ int __pte_alloc(struct mm_struct *mm, pm
pte_free(new);
} else {
mm->nr_ptes++;
- inc_page_state(nr_page_table_pages);
+ inc_zone_page_state(new, NR_PAGETABLE);
pmd_populate(mm, pmd, new);
}
spin_unlock(&mm->page_table_lock);
diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter mm/page_alloc.c
--- devel/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter 2006-06-09 02:49:41.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 02:49:41.000000000 -0700
@@ -613,7 +613,7 @@ static int rmqueue_bulk(struct zone *zon
return i;
}
-char *vm_stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache", "slab" };
+char *vm_stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache", "slab", "pagetable" };
/*
* Manage combined zone based / global counters
@@ -1723,7 +1723,7 @@ void show_free_areas(void)
nr_free_pages(),
global_page_state(NR_SLAB),
global_page_state(NR_MAPPED),
- ps.nr_page_table_pages);
+ global_page_state(NR_PAGETABLE));
for_each_zone(zone) {
int i;
@@ -2713,12 +2713,12 @@ static char *vmstat_text[] = {
"nr_mapped",
"nr_pagecache",
"nr_slab",
+ "nr_page_table_pages",
/* Page state */
"nr_dirty",
"nr_writeback",
"nr_unstable",
- "nr_page_table_pages",
"pgpgin",
"pgpgout",
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
zoned-vm-counters-per-zone-counter-functionality.patch
zoned-vm-counters-include-per-zone-counters-in-proc-vmstat.patch
zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter.patch
zoned-vm-counters-use-per-zone-counters-to-remove-zone_reclaim_interval.patch
zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics.patch
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_dirty-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter.patch
zoned-vm-counters-remove-unused-get_page_stat-functions.patch
zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter.patch
zoned-vm-counters-remove-useless-writeback-structure.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
swap_prefetch-conversion-of-nr_mapped-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_slab-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_dirty-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_writeback-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_unstable-to-per-zone-counter.patch
swap_prefetch-remove-unused-get_page_stat-functions.patch
reiser4-conversion-of-nr_dirty-to-per-zone-counter.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
