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

Commit 05a0416b authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] Drop __get_zone_counts() 



Values are readily available via ZVC per node and global 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 9195481d

drivers/base/node.c

+2 −7
Original line number Diff line number Diff line
@@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
	int n;

	int nid = dev->id;

	struct sysinfo i;

	unsigned long inactive;

	unsigned long active;

	unsigned long free;



	si_meminfo_node(&i, nid);

	__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));





	n = sprintf(buf, "\n"

		       "Node %d MemTotal:     %8lu kB\n"
@@ -74,8 +69,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(i.totalram),

		       nid, K(i.freeram),

		       nid, K(i.totalram - i.freeram),

		       nid, K(active),

		       nid, K(inactive),

		       nid, node_page_state(nid, NR_ACTIVE),

		       nid, node_page_state(nid, NR_INACTIVE),

#ifdef CONFIG_HIGHMEM

		       nid, K(i.totalhigh),

		       nid, K(i.freehigh),

include/linux/mmzone.h

+0 −2
Original line number Diff line number Diff line
@@ -444,8 +444,6 @@ typedef struct pglist_data { 


#include <linux/memory_hotplug.h>



void __get_zone_counts(unsigned long *active, unsigned long *inactive,

			unsigned long *free, struct pglist_data *pgdat);

void get_zone_counts(unsigned long *active, unsigned long *inactive,

			unsigned long *free);

void build_all_zonelists(void);

mm/readahead.c

+2 −6
Original line number Diff line number Diff line
@@ -575,10 +575,6 @@ void handle_ra_miss(struct address_space *mapping, 
 */

unsigned long max_sane_readahead(unsigned long nr)

{

	unsigned long active;

	unsigned long inactive;

	unsigned long free;



	__get_zone_counts(&active, &inactive, &free, NODE_DATA(numa_node_id()));

	return min(nr, (inactive + free) / 2);

	return min(nr, (node_page_state(numa_node_id(), NR_INACTIVE)

		+ node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2);

}

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, struct pglist_data *pgdat)

{

	*active = node_page_state(pgdat->node_id, NR_ACTIVE);

	*inactive = node_page_state(pgdat->node_id, NR_INACTIVE);

	*free = node_page_state(pgdat->node_id, NR_FREE_PAGES);

}



void get_zone_counts(unsigned long *active,

		unsigned long *inactive, unsigned long *free)

{