The patch titled
Drop __get_zone_counts()
has been removed from the -mm tree. Its filename was
drop-__get_zone_counts.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Drop __get_zone_counts()
From: Christoph Lameter <clameter@xxxxxxx>
Values are readily available via ZVC per node and global sums.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/node.c | 9 ++-------
include/linux/mmzone.h | 2 --
mm/readahead.c | 8 ++------
mm/vmstat.c | 8 --------
4 files changed, 4 insertions(+), 23 deletions(-)
diff -puN drivers/base/node.c~drop-__get_zone_counts drivers/base/node.c
--- a/drivers/base/node.c~drop-__get_zone_counts
+++ a/drivers/base/node.c
@@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct
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
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),
diff -puN include/linux/mmzone.h~drop-__get_zone_counts include/linux/mmzone.h
--- a/include/linux/mmzone.h~drop-__get_zone_counts
+++ a/include/linux/mmzone.h
@@ -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);
diff -puN mm/readahead.c~drop-__get_zone_counts mm/readahead.c
--- a/mm/readahead.c~drop-__get_zone_counts
+++ a/mm/readahead.c
@@ -575,10 +575,6 @@ void handle_ra_miss(struct address_space
*/
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);
}
diff -puN mm/vmstat.c~drop-__get_zone_counts mm/vmstat.c
--- a/mm/vmstat.c~drop-__get_zone_counts
+++ a/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, 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)
{
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
smaps-extract-pmd-walker-from-smaps-code.patch
smaps-add-pages-referenced-count-to-smaps.patch
smaps-add-clear_refs-file-to-clear-reference.patch
smaps-add-clear_refs-file-to-clear-reference-fix.patch
replace-highest_possible_node_id-with-nr_node_ids.patch
convert-highest_possible_processor_id-to-nr_cpu_ids.patch
convert-highest_possible_processor_id-to-nr_cpu_ids-fix.patch
slab-reduce-size-of-alien-cache-to-cover-only-possible-nodes.patch
slab-shutdown-cache_reaper-when-cpu-goes-down.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
mm-implement-swap-prefetching-vs-zvc-stuff.patch
mm-implement-swap-prefetching-vs-zvc-stuff-2.patch
zvc-support-nr_slab_reclaimable--nr_slab_unreclaimable-swap_prefetch.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
numa-add-zone_to_nid-function-swap_prefetch.patch
remove-uses-of-kmem_cache_t-from-mm-and-include-linux-slabh-prefetch.patch
readahead-state-based-method-aging-accounting.patch
readahead-state-based-method-aging-accounting-vs-zvc-changes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
