aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 b37ce33f67e..1d5b4fb2c72 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,
{
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/mm/page_alloc.c b/mm/page_alloc.c
index cf1a34074f0..940444c9970 100644
--- a/mm/page_alloc.c
+++ b/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/mm/vmstat.c b/mm/vmstat.c
index 21ba6f88b35..5ffa8c27ead 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)
-{
- *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);