aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2012-01-12 20:20:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 23:13:10 -0500
commit4111304dab198c687bc60f2e235a9f7ee92c47c8 (patch)
treec98fbae214f73f8475bcdc54c8116dea82cd7d14 /mm
parent4d06f382c733f99ec67df006255e87525ac1efd3 (diff)
mm: enum lru_list lru
Mostly we use "enum lru_list lru": change those few "l"s to "lru"s. Signed-off-by: Hugh Dickins <hughd@google.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c6
-rw-r--r--mm/vmscan.c22
2 files changed, 14 insertions, 14 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cb5723c491f0..0027d8f4a1bb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4262,7 +4262,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
4262 for (j = 0; j < MAX_NR_ZONES; j++) { 4262 for (j = 0; j < MAX_NR_ZONES; j++) {
4263 struct zone *zone = pgdat->node_zones + j; 4263 struct zone *zone = pgdat->node_zones + j;
4264 unsigned long size, realsize, memmap_pages; 4264 unsigned long size, realsize, memmap_pages;
4265 enum lru_list l; 4265 enum lru_list lru;
4266 4266
4267 size = zone_spanned_pages_in_node(nid, j, zones_size); 4267 size = zone_spanned_pages_in_node(nid, j, zones_size);
4268 realsize = size - zone_absent_pages_in_node(nid, j, 4268 realsize = size - zone_absent_pages_in_node(nid, j,
@@ -4312,8 +4312,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
4312 zone->zone_pgdat = pgdat; 4312 zone->zone_pgdat = pgdat;
4313 4313
4314 zone_pcp_init(zone); 4314 zone_pcp_init(zone);
4315 for_each_lru(l) 4315 for_each_lru(lru)
4316 INIT_LIST_HEAD(&zone->lruvec.lists[l]); 4316 INIT_LIST_HEAD(&zone->lruvec.lists[lru]);
4317 zone->reclaim_stat.recent_rotated[0] = 0; 4317 zone->reclaim_stat.recent_rotated[0] = 0;
4318 zone->reclaim_stat.recent_rotated[1] = 0; 4318 zone->reclaim_stat.recent_rotated[1] = 0;
4319 zone->reclaim_stat.recent_scanned[0] = 0; 4319 zone->reclaim_stat.recent_scanned[0] = 0;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 7724fb8e7498..01466bf783fd 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1920,7 +1920,7 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
1920 unsigned long ap, fp; 1920 unsigned long ap, fp;
1921 struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz); 1921 struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);
1922 u64 fraction[2], denominator; 1922 u64 fraction[2], denominator;
1923 enum lru_list l; 1923 enum lru_list lru;
1924 int noswap = 0; 1924 int noswap = 0;
1925 bool force_scan = false; 1925 bool force_scan = false;
1926 1926
@@ -2010,18 +2010,18 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
2010 fraction[1] = fp; 2010 fraction[1] = fp;
2011 denominator = ap + fp + 1; 2011 denominator = ap + fp + 1;
2012out: 2012out:
2013 for_each_evictable_lru(l) { 2013 for_each_evictable_lru(lru) {
2014 int file = is_file_lru(l); 2014 int file = is_file_lru(lru);
2015 unsigned long scan; 2015 unsigned long scan;
2016 2016
2017 scan = zone_nr_lru_pages(mz, l); 2017 scan = zone_nr_lru_pages(mz, lru);
2018 if (priority || noswap) { 2018 if (priority || noswap) {
2019 scan >>= priority; 2019 scan >>= priority;
2020 if (!scan && force_scan) 2020 if (!scan && force_scan)
2021 scan = SWAP_CLUSTER_MAX; 2021 scan = SWAP_CLUSTER_MAX;
2022 scan = div64_u64(scan * fraction[file], denominator); 2022 scan = div64_u64(scan * fraction[file], denominator);
2023 } 2023 }
2024 nr[l] = scan; 2024 nr[lru] = scan;
2025 } 2025 }
2026} 2026}
2027 2027
@@ -2097,7 +2097,7 @@ static void shrink_mem_cgroup_zone(int priority, struct mem_cgroup_zone *mz,
2097{ 2097{
2098 unsigned long nr[NR_LRU_LISTS]; 2098 unsigned long nr[NR_LRU_LISTS];
2099 unsigned long nr_to_scan; 2099 unsigned long nr_to_scan;
2100 enum lru_list l; 2100 enum lru_list lru;
2101 unsigned long nr_reclaimed, nr_scanned; 2101 unsigned long nr_reclaimed, nr_scanned;
2102 unsigned long nr_to_reclaim = sc->nr_to_reclaim; 2102 unsigned long nr_to_reclaim = sc->nr_to_reclaim;
2103 struct blk_plug plug; 2103 struct blk_plug plug;
@@ -2110,13 +2110,13 @@ restart:
2110 blk_start_plug(&plug); 2110 blk_start_plug(&plug);
2111 while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] || 2111 while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] ||
2112 nr[LRU_INACTIVE_FILE]) { 2112 nr[LRU_INACTIVE_FILE]) {
2113 for_each_evictable_lru(l) { 2113 for_each_evictable_lru(lru) {
2114 if (nr[l]) { 2114 if (nr[lru]) {
2115 nr_to_scan = min_t(unsigned long, 2115 nr_to_scan = min_t(unsigned long,
2116 nr[l], SWAP_CLUSTER_MAX); 2116 nr[lru], SWAP_CLUSTER_MAX);
2117 nr[l] -= nr_to_scan; 2117 nr[lru] -= nr_to_scan;
2118 2118
2119 nr_reclaimed += shrink_list(l, nr_to_scan, 2119 nr_reclaimed += shrink_list(lru, nr_to_scan,
2120 mz, sc, priority); 2120 mz, sc, priority);
2121 } 2121 }
2122 } 2122 }