diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-06-30 04:55:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 14:25:35 -0400 |
commit | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (patch) | |
tree | e9a2664f0abc5221b9a92e1417d8e02b94a634c4 /arch/i386 | |
parent | b1e7a8fd854d2f895730e82137400012b509650e (diff) |
[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 'arch/i386')
-rw-r--r-- | arch/i386/mm/pgtable.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c index aa211dcddb08..5e735ff90e8a 100644 --- a/arch/i386/mm/pgtable.c +++ b/arch/i386/mm/pgtable.c | |||
@@ -30,7 +30,6 @@ void show_mem(void) | |||
30 | struct page *page; | 30 | struct page *page; |
31 | pg_data_t *pgdat; | 31 | pg_data_t *pgdat; |
32 | unsigned long i; | 32 | unsigned long i; |
33 | struct page_state ps; | ||
34 | unsigned long flags; | 33 | unsigned long flags; |
35 | 34 | ||
36 | printk(KERN_INFO "Mem-info:\n"); | 35 | printk(KERN_INFO "Mem-info:\n"); |
@@ -58,9 +57,9 @@ void show_mem(void) | |||
58 | printk(KERN_INFO "%d pages shared\n", shared); | 57 | printk(KERN_INFO "%d pages shared\n", shared); |
59 | printk(KERN_INFO "%d pages swap cached\n", cached); | 58 | printk(KERN_INFO "%d pages swap cached\n", cached); |
60 | 59 | ||
61 | get_page_state(&ps); | ||
62 | printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); | 60 | printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); |
63 | printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback); | 61 | printk(KERN_INFO "%lu pages writeback\n", |
62 | global_page_state(NR_WRITEBACK)); | ||
64 | printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); | 63 | printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); |
65 | printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB)); | 64 | printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB)); |
66 | printk(KERN_INFO "%lu pages pagetables\n", | 65 | printk(KERN_INFO "%lu pages pagetables\n", |