aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 03:53:05 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-06 03:53:05 -0500
commit3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch)
tree5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /mm/slab.c
parent723cbe0775514853c22dc45005af59c360916af1 (diff)
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
Merge branch 'linus' into tracing/kmemtrace2
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index c65c52dc78d4..dae716b32915 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2166,7 +2166,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
2166 2166
2167 /* 2167 /*
2168 * We use cache_chain_mutex to ensure a consistent view of 2168 * We use cache_chain_mutex to ensure a consistent view of
2169 * cpu_online_map as well. Please see cpuup_callback 2169 * cpu_online_mask as well. Please see cpuup_callback
2170 */ 2170 */
2171 get_online_cpus(); 2171 get_online_cpus();
2172 mutex_lock(&cache_chain_mutex); 2172 mutex_lock(&cache_chain_mutex);