aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-06-30 01:55:40 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 11:25:36 -0700
commitfd39fc8561be33065306bdac0e30414e1e8ac8e1 (patch)
treeae0740716eed3f850a8f7232c61caebe360bb5ae /mm/page_alloc.c
parentce866b34ae1b7f1ce60234cf65855886ac7e7d30 (diff)
downloadkernel_samsung_smdk4412-fd39fc8561be33065306bdac0e30414e1e8ac8e1.zip
kernel_samsung_smdk4412-fd39fc8561be33065306bdac0e30414e1e8ac8e1.tar.gz
kernel_samsung_smdk4412-fd39fc8561be33065306bdac0e30414e1e8ac8e1.tar.bz2
[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/page_alloc.c')
-rw-r--r--mm/page_alloc.c4
1 files changed, 1 insertions, 3 deletions
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),