Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "mm/slab_common.c: cleanup"

Browse source 
This reverts commit 455ce9eb1c. Andrew
sent a better version.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Pekka Enberg 2012-08-16 10:12:18 +03:00
parent e24fc410f5
commit b920536aa0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mm/slab_common.c
View file

@ -53,17 +53,19 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
{ {
struct kmem_cache *s = NULL; struct kmem_cache *s = NULL;
get_online_cpus();
mutex_lock(&slab_mutex);
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
if (!name || in_interrupt() || size < sizeof(void *) || if (!name || in_interrupt() || size < sizeof(void *) ||
size > KMALLOC_MAX_SIZE) { size > KMALLOC_MAX_SIZE) {
printk(KERN_ERR "kmem_cache_create(%s) integrity check" printk(KERN_ERR "kmem_cache_create(%s) integrity check"
" failed\n", name); " failed\n", name);
goto oops; goto out;
} }
#endif
get_online_cpus();
mutex_lock(&slab_mutex);
#ifdef CONFIG_DEBUG_VM
list_for_each_entry(s, &slab_caches, list) { list_for_each_entry(s, &slab_caches, list) {
char tmp; char tmp;
int res; int res;
@ -102,6 +104,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
mutex_unlock(&slab_mutex); mutex_unlock(&slab_mutex);
put_online_cpus(); put_online_cpus();
#ifdef CONFIG_DEBUG_VM
out:
#endif
if (!s && (flags & SLAB_PANIC)) if (!s && (flags & SLAB_PANIC))
panic("kmem_cache_create: Failed to create slab '%s'\n", name); panic("kmem_cache_create: Failed to create slab '%s'\n", name);