Commit 8c20b29d authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

mm/mempool/dmapool: remove CONFIG_DEBUG_SLAB ifdefs 



CONFIG_DEBUG_SLAB is going away with CONFIG_SLAB, so remove dead ifdefs
in mempool and dmapool code.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Tested-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Tested-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent a9e0b9f2

mm/dmapool.c

+1 −1
Original line number Diff line number Diff line
@@ -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

mm/mempool.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */



static __always_inline void kasan_poison_element(mempool_t *pool, void *element)

{