From: Andrew Morton Cc: Christoph Lameter Signed-off-by: Andrew Morton --- include/linux/vmstat.h | 9 --------- mm/vmstat.c | 22 ---------------------- 2 files changed, 31 deletions(-) diff -puN include/linux/vmstat.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-fix include/linux/vmstat.h --- 25/include/linux/vmstat.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-fix Tue Jun 27 15:23:01 2006 +++ 25-akpm/include/linux/vmstat.h Tue Jun 27 15:23:01 2006 @@ -22,13 +22,6 @@ * commented here. */ struct page_state { - unsigned long nr_unstable; /* NFS unstable pages */ -#define GET_PAGE_STATE_LAST nr_unstable - - /* - * The below are zeroed by get_page_state(). Use get_full_page_state() - * to add up all these. - */ unsigned long pgpgin; /* Disk reads */ unsigned long pgpgout; /* Disk writes */ unsigned long pswpin; /* swap reads */ @@ -77,8 +70,6 @@ struct page_state { unsigned long nr_bounce; /* pages for bounce buffers */ }; -extern void get_page_state(struct page_state *ret); -extern void get_page_state_node(struct page_state *ret, int node); extern void get_full_page_state(struct page_state *ret); extern unsigned long read_page_state_offset(unsigned long offset); extern void mod_page_state_offset(unsigned long offset, unsigned long delta); diff -puN mm/vmstat.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-fix mm/vmstat.c --- 25/mm/vmstat.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-fix Tue Jun 27 15:23:01 2006 +++ 25-akpm/mm/vmstat.c Tue Jun 27 15:23:01 2006 @@ -45,28 +45,6 @@ static void __get_page_state(struct page } } -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; _