aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrea Arcangeli <aarcange@redhat.com>2011-06-16 12:56:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 15:01:24 -0700
commit99a15e21d96f6857dafab1e5167e5e8183215c9c (patch)
treeeb6224c0bf11fc243de298c3fa665e418f849d16 /mm
parent7cc2ed05891f424c2e323bc1a368ddb5c78b90f2 (diff)
downloadkernel_samsung_smdk4412-99a15e21d96f6857dafab1e5167e5e8183215c9c.tar.gz
kernel_samsung_smdk4412-99a15e21d96f6857dafab1e5167e5e8183215c9c.tar.bz2
kernel_samsung_smdk4412-99a15e21d96f6857dafab1e5167e5e8183215c9c.zip
migrate: don't account swapcache as shmem
swapcache will reach the below code path in migrate_page_move_mapping, and swapcache is accounted as NR_FILE_PAGES but it's not accounted as NR_SHMEM. Hugh pointed out we must use PageSwapCache instead of comparing mapping to &swapper_space, to avoid build failure with CONFIG_SWAP=n. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Acked-by: Hugh Dickins <hughd@google.com> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/migrate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index e4a5c912983..666e4e67741 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -288,7 +288,7 @@ static int migrate_page_move_mapping(struct address_space *mapping,
*/
__dec_zone_page_state(page, NR_FILE_PAGES);
__inc_zone_page_state(newpage, NR_FILE_PAGES);
- if (PageSwapBacked(page)) {
+ if (!PageSwapCache(page) && PageSwapBacked(page)) {
__dec_zone_page_state(page, NR_SHMEM);
__inc_zone_page_state(newpage, NR_SHMEM);
}