From 488fd30830c58f95d6234629d1a8624f4a07670e Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Wed, 23 Nov 2011 09:14:38 -0600
Subject: [PATCH] --- yaml --- r: 276042 b: refs/heads/master c:
 42d623a8cd08eb93ab221d22cee5a62618895bbf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 49114471e7c2..b2e485d92031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ada19342b2441f290f0043ed7c562682c8c4ede
+refs/heads/master: 42d623a8cd08eb93ab221d22cee5a62618895bbf
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 00efbb56a268..2a9cfd72a3d7 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1978,7 +1978,7 @@ int put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
 		page->pobjects = pobjects;
 		page->next = oldpage;
 
-	} while (this_cpu_cmpxchg(s->cpu_slab->partial, oldpage, page) != oldpage);
+	} while (irqsafe_cpu_cmpxchg(s->cpu_slab->partial, oldpage, page) != oldpage);
 	stat(s, CPU_PARTIAL_FREE);
 	return pobjects;
 }