diff --git a/[refs] b/[refs] index 28c0b42c238a..d2ec4fc22db8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18f820f655ce93b1e4d9b48fc6fcafc64157c6bc +refs/heads/master: 5ec8a847bb8ae2ba6395cfb7cb4bfdc78ada82ed diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index bb7a9837b949..613d385519fe 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -316,6 +316,8 @@ struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS]; */ static __always_inline int index_of(const size_t size) { + extern void __bad_size(void); + if (__builtin_constant_p(size)) { int i = 0; @@ -326,12 +328,9 @@ static __always_inline int index_of(const size_t size) i++; #include "linux/kmalloc_sizes.h" #undef CACHE - { - extern void __bad_size(void); - __bad_size(); - } + __bad_size(); } else - BUG(); + __bad_size(); return 0; }