projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[cascardo/linux.git]
/
fs
/
proc
/
page.c
diff --git
a/fs/proc/page.c
b/fs/proc/page.c
index
e647c55
..
1e3187d
100644
(file)
--- a/
fs/proc/page.c
+++ b/
fs/proc/page.c
@@
-133,6
+133,9
@@
u64 stable_page_flags(struct page *page)
if (PageBuddy(page))
u |= 1 << KPF_BUDDY;
+ if (PageBalloon(page))
+ u |= 1 << KPF_BALLOON;
+
u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked);
u |= kpf_copy_bit(k, KPF_SLAB, PG_slab);