Commit 3065c20d authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

Merge branch 'slab/for-6.19/sheaves_cleanups' into slab/for-next 

Merge series "slab: preparatory cleanups before adding sheaves to all
caches" [1]

Cleanups that were written as part of the full sheaves conversion, which
is not fully ready yet, but they are useful on their own.

Link: https://lore.kernel.org/all/20251105-sheaves-cleanups-v1-0-b8218e1ac7ef@suse.cz/ [1]
parents 8ad018db 6adf4b11

include/linux/gfp_types.h

+0 −6
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ enum { 
#ifdef CONFIG_LOCKDEP

	___GFP_NOLOCKDEP_BIT,

#endif

#ifdef CONFIG_SLAB_OBJ_EXT

	___GFP_NO_OBJ_EXT_BIT,

#endif

	___GFP_LAST_BIT

};
@@ -98,11 +96,7 @@ enum { 
#else

#define ___GFP_NOLOCKDEP	0

#endif

#ifdef CONFIG_SLAB_OBJ_EXT

#define ___GFP_NO_OBJ_EXT       BIT(___GFP_NO_OBJ_EXT_BIT)

#else

#define ___GFP_NO_OBJ_EXT       0

#endif



/*

 * Physical address zone modifiers (see linux/mmzone.h - low four bits)

mm/slab.h

+0 −2
Original line number Diff line number Diff line
@@ -236,10 +236,8 @@ struct kmem_cache_order_objects { 
 * Slab cache management.

 */

struct kmem_cache {

#ifndef CONFIG_SLUB_TINY

	struct kmem_cache_cpu __percpu *cpu_slab;

	struct lock_class_key lock_key;

#endif

	struct slub_percpu_sheaves __percpu *cpu_sheaves;

	/* Used for retrieving partial slabs, etc. */

	slab_flags_t flags;

mm/slub.c

+173 −158

File changed.

Preview size limit exceeded, changes collapsed.