aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-06-30 04:55:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 14:25:36 -0400
commitfd39fc8561be33065306bdac0e30414e1e8ac8e1 (patch)
treeae0740716eed3f850a8f7232c61caebe360bb5ae /include
parentce866b34ae1b7f1ce60234cf65855886ac7e7d30 (diff)
[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 'include')
-rw-r--r--include/linux/mmzone.h1
-rw-r--r--include/linux/vmstat.h9
2 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 885cc9727001..e9d80697f555 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -55,6 +55,7 @@ enum zone_stat_item {
55 NR_PAGETABLE, /* used for pagetables */ 55 NR_PAGETABLE, /* used for pagetables */
56 NR_FILE_DIRTY, 56 NR_FILE_DIRTY,
57 NR_WRITEBACK, 57 NR_WRITEBACK,
58 NR_UNSTABLE_NFS, /* NFS unstable pages */
58 NR_VM_ZONE_STAT_ITEMS }; 59 NR_VM_ZONE_STAT_ITEMS };
59 60
60struct per_cpu_pages { 61struct per_cpu_pages {
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 60c2e0382ceb..9de2a41c885c 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -22,13 +22,6 @@
22 * commented here. 22 * commented here.
23 */ 23 */
24struct page_state { 24struct page_state {
25 unsigned long nr_unstable; /* NFS unstable pages */
26#define GET_PAGE_STATE_LAST nr_unstable
27
28 /*
29 * The below are zeroed by get_page_state(). Use get_full_page_state()
30 * to add up all these.
31 */
32 unsigned long pgpgin; /* Disk reads */ 25 unsigned long pgpgin; /* Disk reads */
33 unsigned long pgpgout; /* Disk writes */ 26 unsigned long pgpgout; /* Disk writes */
34 unsigned long pswpin; /* swap reads */ 27 unsigned long pswpin; /* swap reads */
@@ -77,8 +70,6 @@ struct page_state {
77 unsigned long nr_bounce; /* pages for bounce buffers */ 70 unsigned long nr_bounce; /* pages for bounce buffers */
78}; 71};
79 72
80extern void get_page_state(struct page_state *ret);
81extern void get_page_state_node(struct page_state *ret, int node);
82extern void get_full_page_state(struct page_state *ret); 73extern void get_full_page_state(struct page_state *ret);
83extern unsigned long read_page_state_offset(unsigned long offset); 74extern unsigned long read_page_state_offset(unsigned long offset);
84extern void mod_page_state_offset(unsigned long offset, unsigned long delta); 75extern void mod_page_state_offset(unsigned long offset, unsigned long delta);