[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>

4 files changed, 4 insertions, 23 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 001e6f6b9c1b..475e33f76e0d 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
         int n;
         int nid = dev->id;
         struct sysinfo i;
-        unsigned long inactive;
-        unsigned long active;
-        unsigned long free;
 
         si_meminfo_node(&i, nid);
-        __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
-
 
         n = sprintf(buf, "\n"
                        "Node %d MemTotal:     %8lu kB\n"
@@ -74,8 +69,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                        nid, K(i.totalram),
                        nid, K(i.freeram),
                        nid, K(i.totalram - i.freeram),
-                       nid, K(active),
-                       nid, K(inactive),
+                       nid, node_page_state(nid, NR_ACTIVE),
+                       nid, node_page_state(nid, NR_INACTIVE),
 #ifdef CONFIG_HIGHMEM
                        nid, K(i.totalhigh),
                        nid, K(i.freehigh),
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index d15b1f68aef9..398f2ec55f54 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -444,8 +444,6 @@ typedef struct pglist_data {
 
 #include <linux/memory_hotplug.h>
 
-void __get_zone_counts(unsigned long *active, unsigned long *inactive,
-                        unsigned long *free, struct pglist_data *pgdat);
 void get_zone_counts(unsigned long *active, unsigned long *inactive,
                         unsigned long *free);
 void build_all_zonelists(void);
diff --git a/mm/readahead.c b/mm/readahead.c
index 0f539e8e827a..93d9ee692fd8 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 2ee7ec5e003f..21ba6f88b35c 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)
 {