Skip to content

GitLab

Commit d5da0218 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone

parents e638209a cd8314e3
Hide whitespace changes
Inline Side-by-side
fs/aufs/module.h
View file @ d5da0218
...@@ -97,7 +97,7 @@ static inline void au_kfree_small(const void *p) ...@@ -97,7 +97,7 @@ static inline void au_kfree_small(const void *p)
static inline int au_kmidx_sub(size_t sz, size_t new_sz) static inline int au_kmidx_sub(size_t sz, size_t new_sz)
{ {
#ifndef CONFIG_SLOB #ifndef CONFIG_SLOB
return kmalloc_index(sz) - kmalloc_index(new_sz); return __kmalloc_index(sz, false) - __kmalloc_index(new_sz, false);
#else #else
return -1; /* SLOB is untested */ return -1; /* SLOB is untested */
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment