Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 8 deletions

diff --git a/mm/mempool.c b/mm/mempool.c
index 9e075f829d0d..8f65464da5de 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -104,20 +104,16 @@ static inline void poison_element(mempool_t *pool, void *element)
 
 static void kasan_poison_element(mempool_t *pool, void *element)
 {
-        if (pool->alloc == mempool_alloc_slab)
-                kasan_poison_slab_free(pool->pool_data, element);
-        if (pool->alloc == mempool_kmalloc)
-                kasan_kfree(element);
+        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
+                kasan_poison_kfree(element);
         if (pool->alloc == mempool_alloc_pages)
                 kasan_free_pages(element, (unsigned long)pool->pool_data);
 }
 
 static void kasan_unpoison_element(mempool_t *pool, void *element, gfp_t flags)
 {
-        if (pool->alloc == mempool_alloc_slab)
-                kasan_slab_alloc(pool->pool_data, element, flags);
-        if (pool->alloc == mempool_kmalloc)
-                kasan_krealloc(element, (size_t)pool->pool_data, flags);
+        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
+                kasan_unpoison_slab(element);
         if (pool->alloc == mempool_alloc_pages)
                 kasan_alloc_pages(element, (unsigned long)pool->pool_data);
 }