On Mon, Nov 20, 2023 at 07:34:19PM +0100, Vlastimil Babka wrote:
> CONFIG_DEBUG_SLAB is going away with CONFIG_SLAB, so remove dead ifdefs
> in mempool and dmapool code.
>
> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
> Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx>
> ---
> mm/dmapool.c | 2 +-
> mm/mempool.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/dmapool.c b/mm/dmapool.c
> index a151a21e571b..f0bfc6c490f4 100644
> --- a/mm/dmapool.c
> +++ b/mm/dmapool.c
> @@ -36,7 +36,7 @@
> #include <linux/types.h>
> #include <linux/wait.h>
>
> -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON)
> +#ifdef CONFIG_SLUB_DEBUG_ON
> #define DMAPOOL_DEBUG 1
> #endif
>
> diff --git a/mm/mempool.c b/mm/mempool.c
> index 734bcf5afbb7..4759be0ff9de 100644
> --- a/mm/mempool.c
> +++ b/mm/mempool.c
> @@ -20,7 +20,7 @@
> #include <linux/writeback.h>
> #include "slab.h"
>
> -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON)
> +#ifdef CONFIG_SLUB_DEBUG_ON
> static void poison_error(mempool_t *pool, void *element, size_t size,
> size_t byte)
> {
> @@ -95,14 +95,14 @@ static void poison_element(mempool_t *pool, void *element)
> kunmap_atomic(addr);
> }
> }
> -#else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */
> +#else /* CONFIG_SLUB_DEBUG_ON */
> static inline void check_element(mempool_t *pool, void *element)
> {
> }
> static inline void poison_element(mempool_t *pool, void *element)
> {
> }
> -#endif /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */
> +#endif /* CONFIG_SLUB_DEBUG_ON */
Looks good to me,
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@xxxxxxxxx>
>
> static __always_inline void kasan_poison_element(mempool_t *pool, void *element)
> {
>
> --
> 2.42.1
>
>
