1 files changed, 6 insertions, 2 deletions

diff --git a/fs/proc/page.c b/fs/proc/page.c
index b2855eea5405..712f1b9992cc 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -103,9 +103,9 @@ u64 stable_page_flags(struct page *page)
          * pseudo flags for the well known (anonymous) memory mapped pages
          *
          * Note that page->_mapcount is overloaded in SLOB/SLUB/SLQB, so the
-         * simple test in page_mapcount() is not enough.
+         * simple test in page_mapped() is not enough.
          */
-        if (!PageSlab(page) && page_mapcount(page))
+        if (!PageSlab(page) && page_mapped(page))
                 u |= 1 << KPF_MMAP;
         if (PageAnon(page))
                 u |= 1 << KPF_ANON;
@@ -148,6 +148,8 @@ u64 stable_page_flags(struct page *page)
          */
         if (PageBuddy(page))
                 u |= 1 << KPF_BUDDY;
+        else if (page_count(page) == 0 && is_free_buddy_page(page))
+                u |= 1 << KPF_BUDDY;
 
         if (PageBalloon(page))
                 u |= 1 << KPF_BALLOON;
@@ -158,6 +160,8 @@ u64 stable_page_flags(struct page *page)
         u |= kpf_copy_bit(k, KPF_LOCKED,        PG_locked);
 
         u |= kpf_copy_bit(k, KPF_SLAB,          PG_slab);
+        if (PageTail(page) && PageSlab(compound_head(page)))
+                u |= 1 << KPF_SLAB;
 
         u |= kpf_copy_bit(k, KPF_ERROR,         PG_error);
         u |= kpf_copy_bit(k, KPF_DIRTY,         PG_dirty);