Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e458d4 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] Drop get_zone_counts() 



Values are available via ZVC sums.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 05a0416b

fs/proc/proc_misc.c

+2 −7
Original line number Diff line number Diff line
@@ -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),

mm/page_alloc.c

+2 −7
Original line number Diff line number Diff line
@@ -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),

mm/vmstat.c

+0 −8
Original line number Diff line number Diff line
@@ -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);