diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 9 | ||||
-rw-r--r-- | mm/vmstat.c | 8 |
2 files changed, 2 insertions, 15 deletions
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) | |||
1524 | void show_free_areas(void) | 1524 | void 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 | ||
16 | void 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 |
25 | DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; | 17 | DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; |
26 | EXPORT_PER_CPU_SYMBOL(vm_event_states); | 18 | EXPORT_PER_CPU_SYMBOL(vm_event_states); |