From 67e950c0a152115c08c41722aaee2377c19b4e95 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Fri, 22 Feb 2013 20:20:00 +0400
Subject: [PATCH] --- yaml --- r: 373735 b: refs/heads/master c:
 7d557b3cb69398d83ceabad9cf147c93a3aa97fd h: refs/heads/master i:   373733:
 71430408f49fc18937a4a8cad2d73dc4d01221de   373731:
 75dd62abbaf94da28ff4baa58e65daab6cfd5d0d   373727:
 b00c6e407c57fe1d6c894a731945699d9d3c7a1e v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6fbf14b9ceed..38e565cdfe79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1e0541674904db00e17ce646b0a1d54f59136a5
+refs/heads/master: 7d557b3cb69398d83ceabad9cf147c93a3aa97fd
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 6184b0821f7e..aa0728daf8bb 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3552,6 +3552,12 @@ static struct kmem_cache * __init bootstrap(struct kmem_cache *static_cache)
 
 	memcpy(s, static_cache, kmem_cache->object_size);
 
+	/*
+	 * This runs very early, and only the boot processor is supposed to be
+	 * up.  Even if it weren't true, IRQs are not up so we couldn't fire
+	 * IPIs around.
+	 */
+	__flush_cpu_slab(s, smp_processor_id());
 	for_each_node_state(node, N_NORMAL_MEMORY) {
 		struct kmem_cache_node *n = get_node(s, node);
 		struct page *p;