iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm: rename NR_ANON_PAGES to NR_ANON_MAPPED

Browse Source 
NR_FILE_PAGES  is the number of        file pages.
NR_FILE_MAPPED is the number of mapped file pages.
NR_ANON_PAGES  is the number of mapped anon pages.

This is unhelpful naming as it's easy to confuse NR_FILE_MAPPED and
NR_ANON_PAGES for mapped pages.  This patch renames NR_ANON_PAGES so we
have

NR_FILE_PAGES  is the number of        file pages.
NR_FILE_MAPPED is the number of mapped file pages.
NR_ANON_MAPPED is the number of mapped anon pages.

Link: http://lkml.kernel.org/r/1467970510-21195-19-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mel Gorman 2016-07-28 15:46:17 -07:00 committed by Linus Torvalds
parent 50658e2e04
commit 4b9d0fab71
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/node.c
View File

@ -122,7 +122,7 @@ static ssize_t node_read_meminfo(struct device *dev,
nid, K(sum_zone_node_page_state(nid, NR_WRITEBACK)), nid, K(sum_zone_node_page_state(nid, NR_WRITEBACK)),
nid, K(sum_zone_node_page_state(nid, NR_FILE_PAGES)), nid, K(sum_zone_node_page_state(nid, NR_FILE_PAGES)),
nid, K(node_page_state(pgdat, NR_FILE_MAPPED)), nid, K(node_page_state(pgdat, NR_FILE_MAPPED)),
nid, K(node_page_state(pgdat, NR_ANON_PAGES)), nid, K(node_page_state(pgdat, NR_ANON_MAPPED)),
nid, K(i.sharedram), nid, K(i.sharedram),
nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) * nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) *
THREAD_SIZE / 1024, THREAD_SIZE / 1024,

2
fs/proc/meminfo.c
View File

@ -140,7 +140,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
K(i.freeswap), K(i.freeswap),
K(global_page_state(NR_FILE_DIRTY)), K(global_page_state(NR_FILE_DIRTY)),
K(global_page_state(NR_WRITEBACK)), K(global_page_state(NR_WRITEBACK)),
K(global_node_page_state(NR_ANON_PAGES)), K(global_node_page_state(NR_ANON_MAPPED)),
K(global_node_page_state(NR_FILE_MAPPED)), K(global_node_page_state(NR_FILE_MAPPED)),
K(i.sharedram), K(i.sharedram),
K(global_page_state(NR_SLAB_RECLAIMABLE) + K(global_page_state(NR_SLAB_RECLAIMABLE) +

2
include/linux/mmzone.h
View File

@ -161,7 +161,7 @@ enum node_stat_item {
WORKINGSET_REFAULT, WORKINGSET_REFAULT,
WORKINGSET_ACTIVATE, WORKINGSET_ACTIVATE,
WORKINGSET_NODERECLAIM, WORKINGSET_NODERECLAIM,
NR_ANON_PAGES, /* Mapped anonymous pages */ NR_ANON_MAPPED, /* Mapped anonymous pages */
NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. NR_FILE_MAPPED, /* pagecache pages mapped into pagetables.
only modified from process context */ only modified from process context */
NR_VM_NODE_STAT_ITEMS NR_VM_NODE_STAT_ITEMS

2
mm/migrate.c
View File

@ -501,7 +501,7 @@ int migrate_page_move_mapping(struct address_space *mapping,
* new page and drop references to the old page. * new page and drop references to the old page.
* *
* Note that anonymous pages are accounted for * Note that anonymous pages are accounted for
* via NR_FILE_PAGES and NR_ANON_PAGES if they * via NR_FILE_PAGES and NR_ANON_MAPPED if they
* are mapped to swap space. * are mapped to swap space.
*/ */
if (newzone != oldzone) { if (newzone != oldzone) {

8
mm/rmap.c
View File

@ -1214,7 +1214,7 @@ void do_page_add_anon_rmap(struct page *page,
*/ */
if (compound) if (compound)
__inc_zone_page_state(page, NR_ANON_THPS); __inc_zone_page_state(page, NR_ANON_THPS);
__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);
} }
if (unlikely(PageKsm(page))) if (unlikely(PageKsm(page)))
return; return;
@ -1258,7 +1258,7 @@ void page_add_new_anon_rmap(struct page *page,
/* increment count (starts at -1) */ /* increment count (starts at -1) */
atomic_set(&page->_mapcount, 0); atomic_set(&page->_mapcount, 0);
} }
__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);
__page_set_anon_rmap(page, vma, address, 1); __page_set_anon_rmap(page, vma, address, 1);
} }
@ -1375,7 +1375,7 @@ static void page_remove_anon_compound_rmap(struct page *page)
clear_page_mlock(page); clear_page_mlock(page);
if (nr) { if (nr) {
__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, -nr); __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, -nr);
deferred_split_huge_page(page); deferred_split_huge_page(page);
} }
} }
@ -1404,7 +1404,7 @@ void page_remove_rmap(struct page *page, bool compound)
* these counters are not modified in interrupt context, and * these counters are not modified in interrupt context, and
* pte lock(a spinlock) is held, which implies preemption disabled. * pte lock(a spinlock) is held, which implies preemption disabled.
*/ */
__dec_node_page_state(page, NR_ANON_PAGES); __dec_node_page_state(page, NR_ANON_MAPPED);
if (unlikely(PageMlocked(page))) if (unlikely(PageMlocked(page)))
clear_page_mlock(page); clear_page_mlock(page);