Merge drm/drm-fixes into drm-misc-fixes

[linux-2.6-microblaze.git] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index 79959fa..a258cf4 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -106,7 +106,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element)
        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
                kasan_slab_free_mempool(element);
        else if (pool->alloc == mempool_alloc_pages)
-               kasan_free_pages(element, (unsigned long)pool->pool_data);
+               kasan_free_pages(element, (unsigned long)pool->pool_data, false);
 }
 
 static void kasan_unpoison_element(mempool_t *pool, void *element)
@@ -114,7 +114,7 @@ static void kasan_unpoison_element(mempool_t *pool, void *element)
        if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
                kasan_unpoison_range(element, __ksize(element));
        else if (pool->alloc == mempool_alloc_pages)
-               kasan_alloc_pages(element, (unsigned long)pool->pool_data);
+               kasan_alloc_pages(element, (unsigned long)pool->pool_data, false);
 }
 
 static __always_inline void add_element(mempool_t *pool, void *element)
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(mempool_init);
 mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
                                mempool_free_t *free_fn, void *pool_data)
 {
-       return mempool_create_node(min_nr,alloc_fn,free_fn, pool_data,
+       return mempool_create_node(min_nr, alloc_fn, free_fn, pool_data,
                                   GFP_KERNEL, NUMA_NO_NODE);
 }
 EXPORT_SYMBOL(mempool_create);