projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
slab.h
diff --git
a/mm/slab.h
b/mm/slab.h
index 928823e17e58d1a667ce8d69b45aa3bbf1f4f9af..0e0fdd3658409e0eee9a89fa51b1ea45cfc96466 100644
(file)
--- a/
mm/slab.h
+++ b/
mm/slab.h
@@
-256,7
+256,7
@@
static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
return cachep;
pr_err("%s: Wrong slab cache. %s but object is from %s\n",
-
__FUNCTION
__, cachep->name, s->name);
+
__func
__, cachep->name, s->name);
WARN_ON_ONCE(1);
return s;
}