summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-02-10 01:43:05 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:18 -0800
commit05a0416be2b88d859efcbc4a4290555a04d169a1 (patch)
treeda7216a3a04625a45b952ea21f817d5cdb199530 /mm
parent9195481d2f869a2707a272057f3f8664fd277534 (diff)
downloadlinux-3.10-05a0416be2b88d859efcbc4a4290555a04d169a1.tar.gz
linux-3.10-05a0416be2b88d859efcbc4a4290555a04d169a1.tar.bz2
linux-3.10-05a0416be2b88d859efcbc4a4290555a04d169a1.zip
[PATCH] Drop __get_zone_counts()
Values are readily available via ZVC per node and global sums. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/readahead.c8
-rw-r--r--mm/vmstat.c8
2 files changed, 2 insertions, 14 deletions
diff --git a/mm/readahead.c b/mm/readahead.c
index 0f539e8e827..93d9ee692fd 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -575,10 +575,6 @@ void handle_ra_miss(struct address_space *mapping,
*/
unsigned long max_sane_readahead(unsigned long nr)
{
- unsigned long active;
- unsigned long inactive;
- unsigned long free;
-
- __get_zone_counts(&active, &inactive, &free, NODE_DATA(numa_node_id()));
- return min(nr, (inactive + free) / 2);
+ return min(nr, (node_page_state(numa_node_id(), NR_INACTIVE)
+ + node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2);
}
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 2ee7ec5e003..21ba6f88b35 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -13,14 +13,6 @@
#include <linux/module.h>
#include <linux/cpu.h>
-void __get_zone_counts(unsigned long *active, unsigned long *inactive,
- unsigned long *free, struct pglist_data *pgdat)
-{
- *active = node_page_state(pgdat->node_id, NR_ACTIVE);
- *inactive = node_page_state(pgdat->node_id, NR_INACTIVE);
- *free = node_page_state(pgdat->node_id, NR_FREE_PAGES);
-}
-
void get_zone_counts(unsigned long *active,
unsigned long *inactive, unsigned long *free)
{