aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-02-10 04:43:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 13:51:18 -0500
commit65e458d43dff872ee560e721fb0fdb367bb5adb0 (patch)
treee903ec97a4a6c0ee952108b696387ef098a6a80c
parent05a0416be2b88d859efcbc4a4290555a04d169a1 (diff)
[PATCH] Drop get_zone_counts()
Values are available via ZVC 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>
-rw-r--r--fs/proc/proc_misc.c9
-rw-r--r--mm/page_alloc.c9
-rw-r--r--mm/vmstat.c8
3 files changed, 4 insertions, 22 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index b37ce33f67ea..1d5b4fb2c725 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -121,16 +121,11 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
121{ 121{
122 struct sysinfo i; 122 struct sysinfo i;
123 int len; 123 int len;
124 unsigned long inactive;
125 unsigned long active;
126 unsigned long free;
127 unsigned long committed; 124 unsigned long committed;
128 unsigned long allowed; 125 unsigned long allowed;
129 struct vmalloc_info vmi; 126 struct vmalloc_info vmi;
130 long cached; 127 long cached;
131 128
132 get_zone_counts(&active, &inactive, &free);
133
134/* 129/*
135 * display in kilobytes. 130 * display in kilobytes.
136 */ 131 */
@@ -187,8 +182,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
187 K(i.bufferram), 182 K(i.bufferram),
188 K(cached), 183 K(cached),
189 K(total_swapcache_pages), 184 K(total_swapcache_pages),
190 K(active), 185 K(global_page_state(NR_ACTIVE)),
191 K(inactive), 186 K(global_page_state(NR_INACTIVE)),
192#ifdef CONFIG_HIGHMEM 187#ifdef CONFIG_HIGHMEM
193 K(i.totalhigh), 188 K(i.totalhigh),
194 K(i.freehigh), 189 K(i.freehigh),
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cf1a34074f08..940444c99703 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1524,9 +1524,6 @@ void si_meminfo_node(struct sysinfo *val, int nid)
1524void show_free_areas(void) 1524void show_free_areas(void)
1525{ 1525{
1526 int cpu; 1526 int cpu;
1527 unsigned long active;
1528 unsigned long inactive;
1529 unsigned long free;
1530 struct zone *zone; 1527 struct zone *zone;
1531 1528
1532 for_each_zone(zone) { 1529 for_each_zone(zone) {
@@ -1550,12 +1547,10 @@ void show_free_areas(void)
1550 } 1547 }
1551 } 1548 }
1552 1549
1553 get_zone_counts(&active, &inactive, &free);
1554
1555 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n" 1550 printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
1556 " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n", 1551 " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
1557 active, 1552 global_page_state(NR_ACTIVE),
1558 inactive, 1553 global_page_state(NR_INACTIVE),
1559 global_page_state(NR_FILE_DIRTY), 1554 global_page_state(NR_FILE_DIRTY),
1560 global_page_state(NR_WRITEBACK), 1555 global_page_state(NR_WRITEBACK),
1561 global_page_state(NR_UNSTABLE_NFS), 1556 global_page_state(NR_UNSTABLE_NFS),
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 21ba6f88b35c..5ffa8c27ead8 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -13,14 +13,6 @@
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/cpu.h> 14#include <linux/cpu.h>
15 15
16void get_zone_counts(unsigned long *active,
17 unsigned long *inactive, unsigned long *free)
18{
19 *active = global_page_state(NR_ACTIVE);
20 *inactive = global_page_state(NR_INACTIVE);
21 *free = global_page_state(NR_FREE_PAGES);
22}
23
24#ifdef CONFIG_VM_EVENT_COUNTERS 16#ifdef CONFIG_VM_EVENT_COUNTERS
25DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; 17DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
26EXPORT_PER_CPU_SYMBOL(vm_event_states); 18EXPORT_PER_CPU_SYMBOL(vm_event_states);