diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-06-30 08:55:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:25:35 (GMT) |
| commit | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (patch) | |
| tree | e9a2664f0abc5221b9a92e1417d8e02b94a634c4 /include | |
| parent | b1e7a8fd854d2f895730e82137400012b509650e (diff) | |
| download | linux-ce866b34ae1b7f1ce60234cf65855886ac7e7d30.tar.xz | |
[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 'include')
| -rw-r--r-- | include/linux/mmzone.h | 1 | ||||
| -rw-r--r-- | include/linux/page-flags.h | 8 | ||||
| -rw-r--r-- | include/linux/vmstat.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 1cc8412..885cc97 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -54,6 +54,7 @@ enum zone_stat_item { NR_SLAB, /* Pages used by slab allocator */ NR_PAGETABLE, /* used for pagetables */ NR_FILE_DIRTY, + NR_WRITEBACK, NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index ff235c4..5748642 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -181,7 +181,7 @@ do { \ if (!test_and_set_bit(PG_writeback, \ &(page)->flags)) \ - inc_page_state(nr_writeback); \ + inc_zone_page_state(page, NR_WRITEBACK); \ } while (0) #define TestSetPageWriteback(page) \ ({ \ @@ -189,14 +189,14 @@ ret = test_and_set_bit(PG_writeback, \ &(page)->flags); \ if (!ret) \ - inc_page_state(nr_writeback); \ + inc_zone_page_state(page, NR_WRITEBACK); \ ret; \ }) #define ClearPageWriteback(page) \ do { \ if (test_and_clear_bit(PG_writeback, \ &(page)->flags)) \ - dec_page_state(nr_writeback); \ + dec_zone_page_state(page, NR_WRITEBACK); \ } while (0) #define TestClearPageWriteback(page) \ ({ \ @@ -204,7 +204,7 @@ ret = test_and_clear_bit(PG_writeback, \ &(page)->flags); \ if (ret) \ - dec_page_state(nr_writeback); \ + dec_zone_page_state(page, NR_WRITEBACK); \ ret; \ }) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index b323ea2..60c2e03 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -22,7 +22,6 @@ * commented here. */ struct page_state { - unsigned long nr_writeback; /* Pages under writeback */ unsigned long nr_unstable; /* NFS unstable pages */ #define GET_PAGE_STATE_LAST nr_unstable |