Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/mm/slub.c b/mm/slub.c
index dc77776..1b08fbc 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1093,8 +1093,7 @@ static void setup_page_debug(struct kmem_cache *s, void *addr, int order)
 }
 
 static inline int alloc_consistency_checks(struct kmem_cache *s,
-                                       struct page *page,
-                                       void *object, unsigned long addr)
+                                       struct page *page, void *object)
 {
        if (!check_slab(s, page))
                return 0;
@@ -1115,7 +1114,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s,
                                        void *object, unsigned long addr)
 {
        if (s->flags & SLAB_CONSISTENCY_CHECKS) {
-               if (!alloc_consistency_checks(s, page, object, addr))
+               if (!alloc_consistency_checks(s, page, object))
                        goto bad;
        }
 
@@ -2130,7 +2129,7 @@ redo:
                if (!lock) {
                        lock = 1;
                        /*
-                        * Taking the spinlock removes the possiblity
+                        * Taking the spinlock removes the possibility
                         * that acquire_slab() will see a slab page that
                         * is frozen
                         */
@@ -2254,8 +2253,8 @@ static void unfreeze_partials(struct kmem_cache *s,
 }
 
 /*
- * Put a page that was just frozen (in __slab_free) into a partial page
- * slot if available.
+ * Put a page that was just frozen (in __slab_free|get_partial_node) into a
+ * partial page slot if available.
  *
  * If we did not find a slot then simply move all the partials to the
  * per node partial list.
@@ -2482,8 +2481,7 @@ static inline void *new_slab_objects(struct kmem_cache *s, gfp_t flags,
                stat(s, ALLOC_SLAB);
                c->page = page;
                *pc = c;
-       } else
-               freelist = NULL;
+       }
 
        return freelist;
 }
@@ -4264,7 +4262,7 @@ void __init kmem_cache_init(void)
        cpuhp_setup_state_nocalls(CPUHP_SLUB_DEAD, "slub:dead", NULL,
                                  slub_cpu_dead);
 
-       pr_info("SLUB: HWalign=%d, Order=%u-%u, MinObjects=%u, CPUs=%u, Nodes=%d\n",
+       pr_info("SLUB: HWalign=%d, Order=%u-%u, MinObjects=%u, CPUs=%u, Nodes=%u\n",
                cache_line_size(),
                slub_min_order, slub_max_order, slub_min_objects,
                nr_cpu_ids, nr_node_ids);