From a24f6894ce01c9f17a6ca13e2ebd1a92ce0918e2 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Sat, 10 Feb 2007 01:43:05 -0800
Subject: [PATCH] --- yaml --- r: 47407 b: refs/heads/master c:
 65e458d43dff872ee560e721fb0fdb367bb5adb0 h: refs/heads/master i:   47405:
 e465e580f41351951ee2fd99a421d515154a146d   47403:
 aabfa7396086d5de964e580fc7ff44034a0f81c0   47399:
 4cbd08835af7f3e30a298f167419ed849daf4bdc   47391:
 83692d7a74ced8cded85decba0fc348b426b91e7 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/proc/proc_misc.c | 9 ++-------
 trunk/mm/page_alloc.c     | 9 ++-------
 trunk/mm/vmstat.c         | 8 --------
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index d540fb1c2d46..d25188270cb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05a0416be2b88d859efcbc4a4290555a04d169a1
+refs/heads/master: 65e458d43dff872ee560e721fb0fdb367bb5adb0
diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c
index b37ce33f67ea..1d5b4fb2c725 100644
--- a/trunk/fs/proc/proc_misc.c
+++ b/trunk/fs/proc/proc_misc.c
@@ -121,16 +121,11 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
 {
 	struct sysinfo i;
 	int len;
-	unsigned long inactive;
-	unsigned long active;
-	unsigned long free;
 	unsigned long committed;
 	unsigned long allowed;
 	struct vmalloc_info vmi;
 	long cached;
 
-	get_zone_counts(&active, &inactive, &free);
-
 /*
  * display in kilobytes.
  */
@@ -187,8 +182,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
 		K(i.bufferram),
 		K(cached),
 		K(total_swapcache_pages),
-		K(active),
-		K(inactive),
+		K(global_page_state(NR_ACTIVE)),
+		K(global_page_state(NR_INACTIVE)),
 #ifdef CONFIG_HIGHMEM
 		K(i.totalhigh),
 		K(i.freehigh),
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index cf1a34074f08..940444c99703 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1524,9 +1524,6 @@ void si_meminfo_node(struct sysinfo *val, int nid)
 void show_free_areas(void)
 {
 	int cpu;
-	unsigned long active;
-	unsigned long inactive;
-	unsigned long free;
 	struct zone *zone;
 
 	for_each_zone(zone) {
@@ -1550,12 +1547,10 @@ void show_free_areas(void)
 		}
 	}
 
-	get_zone_counts(&active, &inactive, &free);
-
 	printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
 		" free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
-		active,
-		inactive,
+		global_page_state(NR_ACTIVE),
+		global_page_state(NR_INACTIVE),
 		global_page_state(NR_FILE_DIRTY),
 		global_page_state(NR_WRITEBACK),
 		global_page_state(NR_UNSTABLE_NFS),
diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c
index 21ba6f88b35c..5ffa8c27ead8 100644
--- a/trunk/mm/vmstat.c
+++ b/trunk/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)
-{
-	*active = global_page_state(NR_ACTIVE);
-	*inactive = global_page_state(NR_INACTIVE);
-	*free = global_page_state(NR_FREE_PAGES);
-}
-
 #ifdef CONFIG_VM_EVENT_COUNTERS
 DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
 EXPORT_PER_CPU_SYMBOL(vm_event_states);