mm, pagemap: remove SLOB and SLQB from comments and documentation

SLOB has been removed and SLQB never merged, so remove their mentions
from comments and documentation of pagemap.

In stable_page_flags() also correct an outdated comment mentioning that
PageBuddy() means a page->_refcount of -1, and remove compound_head()
from the PageSlab() call, as that's already implicitly there thanks to
PF_NO_TAIL.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Lorenzo Stoakes <lstoakes@gmail.com>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>

diff --git a/Documentation/admin-guide/mm/pagemap.rst b/Documentation/admin-guide/mm/pagemap.rst
index b5f970dc91e7045bd903238b8045732846c8d47f..c8f380271cad8569d1e528154f9d25771fee82b8 100644 (file)
--- a/Documentation/admin-guide/mm/pagemap.rst
+++ b/Documentation/admin-guide/mm/pagemap.rst
@@ -91,9 +91,9 @@ Short descriptions to the page flags
    The page is being locked for exclusive access, e.g. by undergoing read/write
    IO.
 7 - SLAB
-   The page is managed by the SLAB/SLOB/SLUB/SLQB kernel memory allocator.
-   When compound page is used, SLUB/SLQB will only set this flag on the head
-   page; SLOB will not flag it at all.
+   The page is managed by the SLAB/SLUB kernel memory allocator.
+   When compound page is used, either will only set this flag on the head
+   page.
 10 - BUDDY
     A free memory block managed by the buddy system allocator.
     The buddy system organizes free memory in blocks of various orders.

diff --git a/fs/proc/page.c b/fs/proc/page.c
index 6249c347809a9246d8386b7560057156a9206f71..195b077c0facbf8159b706361172c91a74c8815c 100644 (file)
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -125,7 +125,7 @@ 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
+        * Note that page->_mapcount is overloaded in SLAB, so the
         * simple test in page_mapped() is not enough.
         */
        if (!PageSlab(page) && page_mapped(page))
@@ -165,9 +165,8 @@ u64 stable_page_flags(struct page *page)
 
 
        /*
-        * Caveats on high order pages: page->_refcount will only be set
-        * -1 on the head page; SLUB/SLQB do the same for PG_slab;
-        * SLOB won't set PG_slab at all on compound pages.
+        * Caveats on high order pages: PG_buddy and PG_slab will only be set
+        * on the head page.
         */
        if (PageBuddy(page))
                u |= 1 << KPF_BUDDY;
@@ -185,7 +184,7 @@ 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)))
+       if (PageTail(page) && PageSlab(page))
                u |= 1 << KPF_SLAB;
 
        u |= kpf_copy_bit(k, KPF_ERROR,         PG_error);