1 files changed, 7 insertions, 1 deletions

diff --git a/fs/proc/page.c b/fs/proc/page.c
index 7fcd0d60a968..b8730d9ebaee 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -115,7 +115,13 @@ u64 stable_page_flags(struct page *page)
                 u |= 1 << KPF_COMPOUND_TAIL;
         if (PageHuge(page))
                 u |= 1 << KPF_HUGE;
-        else if (PageTransCompound(page))
+        /*
+         * PageTransCompound can be true for non-huge compound pages (slab
+         * pages or pages allocated by drivers with __GFP_COMP) because it
+         * just checks PG_head/PG_tail, so we need to check PageLRU to make
+         * sure a given page is a thp, not a non-huge compound page.
+         */
+        else if (PageTransCompound(page) && PageLRU(compound_trans_head(page)))
                 u |= 1 << KPF_THP;
 
         /*