diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2023-12-28 21:19:50 +0300 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-01-04 14:32:19 +0300 |
| commit | 61d7e367f8bcc8083f02dcc5ce89b98b1480929d (patch) | |
| tree | 3252503bb4edf51ca281f20d50836743e065b563 /mm/kasan/kasan.h | |
| parent | 31bda717d7777b8b6cf542af2730651ad6bb4839 (diff) | |
| parent | 782f8906f8057efc7151b4b98b0a0280a71d005f (diff) | |
| download | linux-61d7e367f8bcc8083f02dcc5ce89b98b1480929d.tar.xz | |
Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next
Merge the SLAB allocator removal and a number of subsequent SLUB
cleanups and optimizations.
Diffstat (limited to 'mm/kasan/kasan.h')
| -rw-r--r-- | mm/kasan/kasan.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 8b06bab5c406..eef50233640a 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -373,8 +373,7 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags); void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags); void kasan_save_free_info(struct kmem_cache *cache, void *object); -#if defined(CONFIG_KASAN_GENERIC) && \ - (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) +#ifdef CONFIG_KASAN_GENERIC bool kasan_quarantine_put(struct kmem_cache *cache, void *object); void kasan_quarantine_reduce(void); void kasan_quarantine_remove_cache(struct kmem_cache *cache); |