{slub, slob}: use unlikely() for kfree(ZERO_OR_NULL_PTR) check

[linux-2.6] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index edeb942dc8ae0e5ea4eb8f76f5e6504935ceb412..b7d3664fa3a9ca6d8cc5bafd6c7fc881e2d5c58e 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2449,7 +2449,7 @@ size_t ksize(const void *object)
        struct page *page;
        struct kmem_cache *s;
 
-       if (ZERO_OR_NULL_PTR(object))
+       if (unlikely(ZERO_OR_NULL_PTR(object)))
                return 0;
 
        page = get_object_page(object);
@@ -2483,7 +2483,7 @@ void kfree(const void *x)
 {
        struct page *page;
 
-       if (ZERO_OR_NULL_PTR(x))
+       if (unlikely(ZERO_OR_NULL_PTR(x)))
                return;
 
        page = virt_to_head_page(x);
@@ -2800,7 +2800,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, void *caller)
                                                        get_order(size));
        s = get_slab(size, gfpflags);
 
-       if (ZERO_OR_NULL_PTR(s))
+       if (unlikely(ZERO_OR_NULL_PTR(s)))
                return s;
 
        return slab_alloc(s, gfpflags, -1, caller);
@@ -2816,7 +2816,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
                                                        get_order(size));
        s = get_slab(size, gfpflags);
 
-       if (ZERO_OR_NULL_PTR(s))
+       if (unlikely(ZERO_OR_NULL_PTR(s)))
                return s;
 
        return slab_alloc(s, gfpflags, node, caller);