diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-06-30 01:55:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 11:25:35 -0700 |
| commit | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (patch) | |
| tree | e9a2664f0abc5221b9a92e1417d8e02b94a634c4 /mm | |
| parent | b1e7a8fd854d2f895730e82137400012b509650e (diff) | |
| download | linux-ce866b34ae1b7f1ce60234cf65855886ac7e7d30.tar.gz linux-ce866b34ae1b7f1ce60234cf65855886ac7e7d30.tar.bz2 linux-ce866b34ae1b7f1ce60234cf65855886ac7e7d30.zip | |
[PATCH] zoned vm counters: conversion of nr_writeback to per zone counter
Conversion of nr_writeback to per zone counter.
This removes the last page_state counter from arch/i386/mm/pgtable.c so we
drop the page_state from there.
[akpm@osdl.org: bugfix]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 2 | ||||
| -rw-r--r-- | mm/page_alloc.c | 2 | ||||
| -rw-r--r-- | mm/vmstat.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index da8547830098..3cfdff4b1985 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -113,7 +113,7 @@ static void get_writeback_state(struct writeback_state *wbs) wbs->nr_unstable = read_page_state(nr_unstable); wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) + global_page_state(NR_ANON_PAGES); - wbs->nr_writeback = read_page_state(nr_writeback); + wbs->nr_writeback = global_page_state(NR_WRITEBACK); } /* diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c2b9aa4acc46..a12e894a8bca 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1315,7 +1315,7 @@ void show_free_areas(void) active, inactive, global_page_state(NR_FILE_DIRTY), - ps.nr_writeback, + global_page_state(NR_WRITEBACK), ps.nr_unstable, nr_free_pages(), global_page_state(NR_SLAB), diff --git a/mm/vmstat.c b/mm/vmstat.c index 1982fb533a40..e84c7e520a1d 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -401,9 +401,9 @@ static char *vmstat_text[] = { "nr_slab", "nr_page_table_pages", "nr_dirty", + "nr_writeback", /* Page state */ - "nr_writeback", "nr_unstable", "pgpgin", |