Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Drop __get_zone_counts()

Browse source 
Values are readily available via ZVC per node and global 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>
This commit is contained in:
Christoph Lameter 2007-02-10 01:43:05 -08:00 • committed by Linus Torvalds
parent 9195481d2f
commit 05a0416be2
4 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/base/node.c
View file

@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
int n; int n;
int nid = dev->id; int nid = dev->id;
struct sysinfo i; struct sysinfo i;
unsigned long inactive;
unsigned long active;
unsigned long free;
si_meminfo_node(&i, nid); si_meminfo_node(&i, nid);
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
n = sprintf(buf, "\n" n = sprintf(buf, "\n"
"Node %d MemTotal: %8lu kB\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.totalram),
nid, K(i.freeram), nid, K(i.freeram),
nid, K(i.totalram - i.freeram), nid, K(i.totalram - i.freeram),
nid, K(active), nid, node_page_state(nid, NR_ACTIVE),
nid, K(inactive), nid, node_page_state(nid, NR_INACTIVE),
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
nid, K(i.totalhigh), nid, K(i.totalhigh),
nid, K(i.freehigh), nid, K(i.freehigh),

2
include/linux/mmzone.h
View file

@ -444,8 +444,6 @@ typedef struct pglist_data {
#include <linux/memory_hotplug.h> #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, void get_zone_counts(unsigned long *active, unsigned long *inactive,
unsigned long *free); unsigned long *free);
void build_all_zonelists(void); void build_all_zonelists(void);

8
mm/readahead.c
View file

@ -575,10 +575,6 @@ void handle_ra_miss(struct address_space *mapping,
*/ */
unsigned long max_sane_readahead(unsigned long nr) unsigned long max_sane_readahead(unsigned long nr)
{ {
unsigned long active; return min(nr, (node_page_state(numa_node_id(), NR_INACTIVE)
unsigned long inactive; + node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2);
unsigned long free;
__get_zone_counts(&active, &inactive, &free, NODE_DATA(numa_node_id()));
return min(nr, (inactive + free) / 2);
} }

8
mm/vmstat.c
View file

@ -13,14 +13,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/cpu.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, void get_zone_counts(unsigned long *active,
unsigned long *inactive, unsigned long *free) unsigned long *inactive, unsigned long *free)
{ {