diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-03-12 10:16:56 +0100 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-03-12 10:16:56 +0100 |
| commit | 1a1c4e4576d439a14b2499de52b9225c69348903 (patch) | |
| tree | e348f454c74d1f89a6b028adacb254b30f8c73d0 /mm/slub.c | |
| parent | 466ed9eed674ae1100ef15a9fa2e2ac4aee56a47 (diff) | |
| parent | 96d8dbb6f65041b670a79e8ae76f67cc11dee203 (diff) | |
Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-linus
Merge a series from myself that replaces hardcoded SLAB_ cache flag
values with an enum, and explicitly deprecates the SLAB_MEM_SPREAD flag
that is a no-op sine SLAB removal.
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c index 5feb1776a130..1bb2a93cf7b6 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -306,13 +306,13 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s) /* Internal SLUB flags */ /* Poison object */ -#define __OBJECT_POISON ((slab_flags_t __force)0x80000000U) +#define __OBJECT_POISON __SLAB_FLAG_BIT(_SLAB_OBJECT_POISON) /* Use cmpxchg_double */ #ifdef system_has_freelist_aba -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0x40000000U) +#define __CMPXCHG_DOUBLE __SLAB_FLAG_BIT(_SLAB_CMPXCHG_DOUBLE) #else -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0U) +#define __CMPXCHG_DOUBLE __SLAB_FLAG_UNUSED #endif /* |