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:36 -0700 |
| commit | fd39fc8561be33065306bdac0e30414e1e8ac8e1 (patch) | |
| tree | ae0740716eed3f850a8f7232c61caebe360bb5ae /mm | |
| parent | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (diff) | |
| download | op-kernel-dev-fd39fc8561be33065306bdac0e30414e1e8ac8e1.zip op-kernel-dev-fd39fc8561be33065306bdac0e30414e1e8ac8e1.tar.gz | |
[PATCH] zoned vm counters: conversion of nr_unstable to per zone counter
Conversion of nr_unstable to a per zone counter
We need to do some special modifications to the nfs code since there are
multiple cases of disposition and we need to have a page ref for proper
accounting.
This converts the last critical page state of the VM and therefore we need to
remove several functions that were depending on GET_PAGE_STATE_LAST in order
to make the kernel compile again. We are only left with event type counters
in page state.
[akpm@osdl.org: bugfixes]
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 | 4 | ||||
| -rw-r--r-- | mm/vmstat.c | 25 |
3 files changed, 3 insertions, 28 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 3cfdff4..de9836f 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -110,7 +110,7 @@ struct writeback_state static void get_writeback_state(struct writeback_state *wbs) { wbs->nr_dirty = global_page_state(NR_FILE_DIRTY); - wbs->nr_unstable = read_page_state(nr_unstable); + wbs->nr_unstable = global_page_state(NR_UNSTABLE_NFS); wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) + global_page_state(NR_ANON_PAGES); wbs->nr_writeback = global_page_state(NR_WRITEBACK); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a12e894..6aa2c31 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1271,7 +1271,6 @@ void si_meminfo_node(struct sysinfo *val, int nid) */ void show_free_areas(void) { - struct page_state ps; int cpu, temperature; unsigned long active; unsigned long inactive; @@ -1303,7 +1302,6 @@ void show_free_areas(void) } } - get_page_state(&ps); get_zone_counts(&active, &inactive, &free); printk("Free pages: %11ukB (%ukB HighMem)\n", @@ -1316,7 +1314,7 @@ void show_free_areas(void) inactive, global_page_state(NR_FILE_DIRTY), global_page_state(NR_WRITEBACK), - ps.nr_unstable, + global_page_state(NR_UNSTABLE_NFS), nr_free_pages(), global_page_state(NR_SLAB), global_page_state(NR_FILE_MAPPED), diff --git a/mm/vmstat.c b/mm/vmstat.c index e84c7e5..9dc270a 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -45,28 +45,6 @@ static void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask) } } -void get_page_state_node(struct page_state *ret, int node) -{ - int nr; - cpumask_t mask = node_to_cpumask(node); - - nr = offsetof(struct page_state, GET_PAGE_STATE_LAST); - nr /= sizeof(unsigned long); - - __get_page_state(ret, nr+1, &mask); -} - -void get_page_state(struct page_state *ret) -{ - int nr; - cpumask_t mask = CPU_MASK_ALL; - - nr = offsetof(struct page_state, GET_PAGE_STATE_LAST); - nr /= sizeof(unsigned long); - - __get_page_state(ret, nr + 1, &mask); -} - void get_full_page_state(struct page_state *ret) { cpumask_t mask = CPU_MASK_ALL; @@ -402,10 +380,9 @@ static char *vmstat_text[] = { "nr_page_table_pages", "nr_dirty", "nr_writeback", - - /* Page state */ "nr_unstable", + /* Event counters */ "pgpgin", "pgpgout", "pswpin", |
