Merge "mm: slub: share object_err function"

This commit is contained in:
Linux Build Service Account 2015-05-09 18:39:02 -07:00 committed by Gerrit - the friendly Code Review server
commit ba0a1d1d30
2 changed files with 4 additions and 1 deletions

View file

@ -224,4 +224,7 @@ static inline void *virt_to_obj(struct kmem_cache *s,
return (void *)x - ((x - slab_page) % s->size);
}
void object_err(struct kmem_cache *s, struct page *page,
u8 *object, char *reason);
#endif /* _LINUX_SLUB_DEF_H */

View file

@ -622,7 +622,7 @@ static void slab_panic(const char *cause)
static inline void slab_panic(const char *cause) {}
#endif
static void object_err(struct kmem_cache *s, struct page *page,
void object_err(struct kmem_cache *s, struct page *page,
u8 *object, char *reason)
{
slab_bug(s, "%s", reason);