diff --git a/[refs] b/[refs] index 3eb5751fa07e..aedcff71a0ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cdc82ee1ae36c1ae4631fc3a782faeb0b90df38 +refs/heads/master: eafb42707b21beb42bba4eae7b742f837ee9d2e0 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index c9adfce00405..ad113c431e39 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -2907,8 +2907,7 @@ void *__kmalloc(size_t size, unsigned int __nocast flags) * functions. */ cachep = __find_general_cachep(size, flags); - if (unlikely(cachep == NULL)) - return NULL; + BUG_ON(!cachep); /* Allocation size too large for kmalloc */ return __cache_alloc(cachep, flags); } EXPORT_SYMBOL(__kmalloc);