Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / fs / proc / page.c

diff --git a/fs/proc/page.c b/fs/proc/page.c
index 9d926bd279a439b652247546fbb3a26ebf0b5272..2707c6c7a20f0dc8bac60ad129103570b4cb10d0 100644 (file)
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -172,10 +172,8 @@ static u64 get_uflags(struct page *page)
        u |= kpf_copy_bit(k, KPF_SWAPCACHE,     PG_swapcache);
        u |= kpf_copy_bit(k, KPF_SWAPBACKED,    PG_swapbacked);
 
-#ifdef CONFIG_UNEVICTABLE_LRU
        u |= kpf_copy_bit(k, KPF_UNEVICTABLE,   PG_unevictable);
        u |= kpf_copy_bit(k, KPF_MLOCKED,       PG_mlocked);
-#endif
 
 #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
        u |= kpf_copy_bit(k, KPF_UNCACHED,      PG_uncached);