From 339a23e887e53680c53f6fb01bd166fca9962ce5 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Wed, 28 Nov 2012 16:23:00 +0000
Subject: [PATCH] --- yaml --- r: 346881 b: refs/heads/master c:
 59a09917c95e5209135b4f1a87f1263d6ef40fdb h: refs/heads/master i:   346879:
 ecedc3942fbe01d459dae66aa7ea1a03021ea154 v: v3

---
 [refs]          |  2 +-
 trunk/mm/slub.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6ac927d8fdf0..dea8df815535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a755b76ab4cefe3d3aa046f3abc62b7e087336b3
+refs/heads/master: 59a09917c95e5209135b4f1a87f1263d6ef40fdb
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index b2ada3db4225..33576b0cfc41 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1869,12 +1869,14 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, void *freel
 /*
  * Unfreeze all the cpu partial slabs.
  *
- * This function must be called with interrupt disabled.
+ * This function must be called with interrupts disabled
+ * for the cpu using c (or some other guarantee must be there
+ * to guarantee no concurrent accesses).
  */
-static void unfreeze_partials(struct kmem_cache *s)
+static void unfreeze_partials(struct kmem_cache *s,
+		struct kmem_cache_cpu *c)
 {
 	struct kmem_cache_node *n = NULL, *n2 = NULL;
-	struct kmem_cache_cpu *c = this_cpu_ptr(s->cpu_slab);
 	struct page *page, *discard_page = NULL;
 
 	while ((page = c->partial)) {
@@ -1960,7 +1962,7 @@ static int put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 				 * set to the per node partial list.
 				 */
 				local_irq_save(flags);
-				unfreeze_partials(s);
+				unfreeze_partials(s, this_cpu_ptr(s->cpu_slab));
 				local_irq_restore(flags);
 				oldpage = NULL;
 				pobjects = 0;
@@ -2003,7 +2005,7 @@ static inline void __flush_cpu_slab(struct kmem_cache *s, int cpu)
 		if (c->page)
 			flush_slab(s, c);
 
-		unfreeze_partials(s);
+		unfreeze_partials(s, c);
 	}
 }