Skip to content

Commit c4ba69f

Browse files
committed
mm, page_flags: remove PG_slob_free
With SLOB removed we no longer need the PG_slob_free alias for PG_private. Also update tools/mm/page-types. Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: Lorenzo Stoakes <lstoakes@gmail.com> Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
1 parent c9929f0 commit c4ba69f

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

include/linux/page-flags.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ enum pageflags {
174174
/* Remapped by swiotlb-xen. */
175175
PG_xen_remapped = PG_owner_priv_1,
176176

177-
/* SLOB */
178-
PG_slob_free = PG_private,
179-
180177
#ifdef CONFIG_MEMORY_FAILURE
181178
/*
182179
* Compound pages. Stored in first tail page's flags.
@@ -483,7 +480,6 @@ PAGEFLAG(Active, active, PF_HEAD) __CLEARPAGEFLAG(Active, active, PF_HEAD)
483480
PAGEFLAG(Workingset, workingset, PF_HEAD)
484481
TESTCLEARFLAG(Workingset, workingset, PF_HEAD)
485482
__PAGEFLAG(Slab, slab, PF_NO_TAIL)
486-
__PAGEFLAG(SlobFree, slob_free, PF_NO_TAIL)
487483
PAGEFLAG(Checked, checked, PF_NO_COMPOUND) /* Used by some filesystems */
488484

489485
/* Xen */

tools/mm/page-types.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
*/
8686
#define KPF_ANON_EXCLUSIVE 47
8787
#define KPF_READAHEAD 48
88-
#define KPF_SLOB_FREE 49
8988
#define KPF_SLUB_FROZEN 50
9089
#define KPF_SLUB_DEBUG 51
9190
#define KPF_FILE 61
@@ -141,7 +140,6 @@ static const char * const page_flag_names[] = {
141140

142141
[KPF_ANON_EXCLUSIVE] = "d:anon_exclusive",
143142
[KPF_READAHEAD] = "I:readahead",
144-
[KPF_SLOB_FREE] = "P:slob_free",
145143
[KPF_SLUB_FROZEN] = "A:slub_frozen",
146144
[KPF_SLUB_DEBUG] = "E:slub_debug",
147145

@@ -478,10 +476,8 @@ static uint64_t expand_overloaded_flags(uint64_t flags, uint64_t pme)
478476
if ((flags & BIT(ANON)) && (flags & BIT(MAPPEDTODISK)))
479477
flags ^= BIT(MAPPEDTODISK) | BIT(ANON_EXCLUSIVE);
480478

481-
/* SLOB/SLUB overload several page flags */
479+
/* SLUB overloads several page flags */
482480
if (flags & BIT(SLAB)) {
483-
if (flags & BIT(PRIVATE))
484-
flags ^= BIT(PRIVATE) | BIT(SLOB_FREE);
485481
if (flags & BIT(ACTIVE))
486482
flags ^= BIT(ACTIVE) | BIT(SLUB_FROZEN);
487483
if (flags & BIT(ERROR))

0 commit comments

Comments
 (0)