Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

Pull SLAB changes from Pekka Enberg:
 "There's the new kmalloc_array() API, minor fixes and performance
  improvements, but quite honestly, nothing terribly exciting."

* 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  mm: SLAB Out-of-memory diagnostics
  slab: introduce kmalloc_array()
  slub: per cpu partial statistics change
  slub: include include for prefetch
  slub: Do not hold slub_lock when calling sysfs_slab_add()
  slub: prefetch next freelist pointer in slab_alloc()
  slab, cleanup: remove unneeded return

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index ca122b36aec1..c2f8c8bc56ed 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -22,7 +22,7 @@ enum stat_item {
         FREE_FROZEN,            /* Freeing to frozen slab */
         FREE_ADD_PARTIAL,       /* Freeing moves slab to partial list */
         FREE_REMOVE_PARTIAL,    /* Freeing removes last object */
-        ALLOC_FROM_PARTIAL,     /* Cpu slab acquired from partial list */
+        ALLOC_FROM_PARTIAL,     /* Cpu slab acquired from node partial list */
         ALLOC_SLAB,             /* Cpu slab acquired from page allocator */
         ALLOC_REFILL,           /* Refill cpu slab from slab freelist */
         ALLOC_NODE_MISMATCH,    /* Switching cpu slab */
@@ -38,7 +38,9 @@ enum stat_item {
         CMPXCHG_DOUBLE_CPU_FAIL,/* Failure of this_cpu_cmpxchg_double */
         CMPXCHG_DOUBLE_FAIL,    /* Number of times that cmpxchg double did not match */
         CPU_PARTIAL_ALLOC,      /* Used cpu partial on alloc */
-        CPU_PARTIAL_FREE,       /* USed cpu partial on free */
+        CPU_PARTIAL_FREE,       /* Refill cpu partial on free */
+        CPU_PARTIAL_NODE,       /* Refill cpu partial from node partial */
+        CPU_PARTIAL_DRAIN,      /* Drain cpu partial to node partial */
         NR_SLUB_STAT_ITEMS };
 
 struct kmem_cache_cpu {