Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6789123 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

mm: fix KPF_SWAPCACHE in /proc/kpageflags 



Commit 6326fec1 ("mm: Use owner_priv bit for PageSwapCache, valid
when PageSwapBacked") aliased PG_swapcache to PG_owner_priv_1 (and
depending on PageSwapBacked being true).

As a result, the KPF_SWAPCACHE bit in '/proc/kpageflags' should now be
synthesized, instead of being shown on unrelated pages which just happen
to have PG_owner_priv_1 set.

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a524c218

fs/proc/page.c

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ u64 stable_page_flags(struct page *page) 
	u |= kpf_copy_bit(k, KPF_ACTIVE,	PG_active);

	u |= kpf_copy_bit(k, KPF_RECLAIM,	PG_reclaim);



	u |= kpf_copy_bit(k, KPF_SWAPCACHE,	PG_swapcache);

	if (PageSwapCache(page))

		u |= 1 << KPF_SWAPCACHE;

	u |= kpf_copy_bit(k, KPF_SWAPBACKED,	PG_swapbacked);



	u |= kpf_copy_bit(k, KPF_UNEVICTABLE,	PG_unevictable);