Merge tag 'fbdev-3.12-omap-legacy-removal' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index f729c46639fa6606a9591d1f9891a928f801f47d..91bd3f2dd2f02622d6aa32802d2bdcd70ee922bd 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -360,7 +360,7 @@ static void slob_free(void *block, int size)
                        clear_slob_page_free(sp);
                spin_unlock_irqrestore(&slob_lock, flags);
                __ClearPageSlab(sp);
-               reset_page_mapcount(sp);
+               page_mapcount_reset(sp);
                slob_free_pages(b, 0);
                return;
        }
@@ -554,7 +554,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
                                            flags, node);
        }
 
-       if (c->ctor)
+       if (b && c->ctor)
                c->ctor(b);
 
        kmemleak_alloc_recursive(b, c->size, 1, c->flags, flags);