---

yaml --- r: 297268 b: refs/heads/master c: a8364d5 h: refs/heads/master v: v3
git-mirror · Mar 29, 2012 · f21feac · f21feac
1 parent c76262c
commit f21feac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a7e98e024ffa9f7e4554dd720c508015c4a831
+refs/heads/master: a8364d5555b2030d093cde0f07951628e55454e1
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -2028,9 +2028,17 @@ static void flush_cpu_slab(void *d)
 	__flush_cpu_slab(s, smp_processor_id());
 }
 
+static bool has_cpu_slab(int cpu, void *info)
+{
+	struct kmem_cache *s = info;
+	struct kmem_cache_cpu *c = per_cpu_ptr(s->cpu_slab, cpu);
+
+	return !!(c->page);
+}
+
 static void flush_all(struct kmem_cache *s)
 {
-	on_each_cpu(flush_cpu_slab, s, 1);
+	on_each_cpu_cond(has_cpu_slab, flush_cpu_slab, s, 1, GFP_ATOMIC);
 }
 
 /*