aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-09-26 02:31:51 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:48:51 -0400
commit8417bba4b151346ed475fcc923693c9e3be89063 (patch)
tree93d559e32bc76077c1f837aed09a5df56849c610
parentd00bcc98d7ec2c87391c9d9e1cca519ef64d33ef (diff)
[PATCH] Replace min_unmapped_ratio by min_unmapped_pages in struct zone
*_pages is a better description of the role of the variable. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/mmzone.h2
-rw-r--r--mm/page_alloc.c4
-rw-r--r--mm/vmscan.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 7fe317164b73..a703527e2b45 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -169,7 +169,7 @@ struct zone {
169 /* 169 /*
170 * zone reclaim becomes active if more unmapped pages exist. 170 * zone reclaim becomes active if more unmapped pages exist.
171 */ 171 */
172 unsigned long min_unmapped_ratio; 172 unsigned long min_unmapped_pages;
173 struct per_cpu_pageset *pageset[NR_CPUS]; 173 struct per_cpu_pageset *pageset[NR_CPUS];
174#else 174#else
175 struct per_cpu_pageset pageset[NR_CPUS]; 175 struct per_cpu_pageset pageset[NR_CPUS];
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f7ea020c23ea..5da6bc4e0a6b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2002,7 +2002,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat,
2002 zone->spanned_pages = size; 2002 zone->spanned_pages = size;
2003 zone->present_pages = realsize; 2003 zone->present_pages = realsize;
2004#ifdef CONFIG_NUMA 2004#ifdef CONFIG_NUMA
2005 zone->min_unmapped_ratio = (realsize*sysctl_min_unmapped_ratio) 2005 zone->min_unmapped_pages = (realsize*sysctl_min_unmapped_ratio)
2006 / 100; 2006 / 100;
2007#endif 2007#endif
2008 zone->name = zone_names[j]; 2008 zone->name = zone_names[j];
@@ -2313,7 +2313,7 @@ int sysctl_min_unmapped_ratio_sysctl_handler(ctl_table *table, int write,
2313 return rc; 2313 return rc;
2314 2314
2315 for_each_zone(zone) 2315 for_each_zone(zone)
2316 zone->min_unmapped_ratio = (zone->present_pages * 2316 zone->min_unmapped_pages = (zone->present_pages *
2317 sysctl_min_unmapped_ratio) / 100; 2317 sysctl_min_unmapped_ratio) / 100;
2318 return 0; 2318 return 0;
2319} 2319}
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 8f35d7d585cb..5154c25e8440 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1618,7 +1618,7 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
1618 * unmapped file backed pages. 1618 * unmapped file backed pages.
1619 */ 1619 */
1620 if (zone_page_state(zone, NR_FILE_PAGES) - 1620 if (zone_page_state(zone, NR_FILE_PAGES) -
1621 zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped_ratio) 1621 zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped_pages)
1622 return 0; 1622 return 0;
1623 1623
1624 /* 1624 /*