|
@@ -861,7 +861,7 @@ static void cache_estimate(unsigned long gfporder, size_t buffer_size,
|
|
*left_over = slab_size - nr_objs*buffer_size - mgmt_size;
|
|
*left_over = slab_size - nr_objs*buffer_size - mgmt_size;
|
|
}
|
|
}
|
|
|
|
|
|
-#define slab_error(cachep, msg) __slab_error(__FUNCTION__, cachep, msg)
|
|
|
|
|
|
+#define slab_error(cachep, msg) __slab_error(__func__, cachep, msg)
|
|
|
|
|
|
static void __slab_error(const char *function, struct kmem_cache *cachep,
|
|
static void __slab_error(const char *function, struct kmem_cache *cachep,
|
|
char *msg)
|
|
char *msg)
|
|
@@ -2156,7 +2156,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
|
|
*/
|
|
*/
|
|
if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
|
|
if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
|
|
size > KMALLOC_MAX_SIZE) {
|
|
size > KMALLOC_MAX_SIZE) {
|
|
- printk(KERN_ERR "%s: Early error in slab %s\n", __FUNCTION__,
|
|
|
|
|
|
+ printk(KERN_ERR "%s: Early error in slab %s\n", __func__,
|
|
name);
|
|
name);
|
|
BUG();
|
|
BUG();
|
|
}
|
|
}
|