Commit 8417bba4 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d00bcc98

include/linux/mmzone.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ struct zone { 
	/*

	 * zone reclaim becomes active if more unmapped pages exist.

	 */

	unsigned long		min_unmapped_ratio;

	unsigned long		min_unmapped_pages;

	struct per_cpu_pageset	*pageset[NR_CPUS];

#else

	struct per_cpu_pageset	pageset[NR_CPUS];

mm/page_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -2002,7 +2002,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat, 
		zone->spanned_pages = size;

		zone->present_pages = realsize;

#ifdef CONFIG_NUMA

		zone->min_unmapped_ratio = (realsize*sysctl_min_unmapped_ratio)

		zone->min_unmapped_pages = (realsize*sysctl_min_unmapped_ratio)

						/ 100;

#endif

		zone->name = zone_names[j];
@@ -2313,7 +2313,7 @@ int sysctl_min_unmapped_ratio_sysctl_handler(ctl_table *table, int write, 
		return rc;



	for_each_zone(zone)

		zone->min_unmapped_ratio = (zone->present_pages *

		zone->min_unmapped_pages = (zone->present_pages *

				sysctl_min_unmapped_ratio) / 100;

	return 0;

}

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) 
	 * unmapped file backed pages.

	 */

	if (zone_page_state(zone, NR_FILE_PAGES) -

	    zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped_ratio)

	    zone_page_state(zone, NR_FILE_MAPPED) <= zone->min_unmapped_pages)

		return 0;



	/*