|
@@ -3561,7 +3561,7 @@ done:
|
|
|
* Fallback to other node is possible if __GFP_THISNODE is not set.
|
|
|
*/
|
|
|
static __always_inline void *
|
|
|
-__cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
|
|
|
+slab_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
|
|
|
unsigned long caller)
|
|
|
{
|
|
|
unsigned long save_flags;
|
|
@@ -3648,7 +3648,7 @@ __do_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
|
|
static __always_inline void *
|
|
|
-__cache_alloc(struct kmem_cache *cachep, gfp_t flags, unsigned long caller)
|
|
|
+slab_alloc(struct kmem_cache *cachep, gfp_t flags, unsigned long caller)
|
|
|
{
|
|
|
unsigned long save_flags;
|
|
|
void *objp;
|
|
@@ -3824,7 +3824,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
|
|
|
*/
|
|
|
void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
|
|
|
{
|
|
|
- void *ret = __cache_alloc(cachep, flags, _RET_IP_);
|
|
|
+ void *ret = slab_alloc(cachep, flags, _RET_IP_);
|
|
|
|
|
|
trace_kmem_cache_alloc(_RET_IP_, ret,
|
|
|
cachep->object_size, cachep->size, flags);
|
|
@@ -3839,7 +3839,7 @@ kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
|
|
|
{
|
|
|
void *ret;
|
|
|
|
|
|
- ret = __cache_alloc(cachep, flags, _RET_IP_);
|
|
|
+ ret = slab_alloc(cachep, flags, _RET_IP_);
|
|
|
|
|
|
trace_kmalloc(_RET_IP_, ret,
|
|
|
size, cachep->size, flags);
|
|
@@ -3851,7 +3851,7 @@ EXPORT_SYMBOL(kmem_cache_alloc_trace);
|
|
|
#ifdef CONFIG_NUMA
|
|
|
void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
|
|
|
{
|
|
|
- void *ret = __cache_alloc_node(cachep, flags, nodeid, _RET_IP_);
|
|
|
+ void *ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP_);
|
|
|
|
|
|
trace_kmem_cache_alloc_node(_RET_IP_, ret,
|
|
|
cachep->object_size, cachep->size,
|
|
@@ -3869,7 +3869,7 @@ void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep,
|
|
|
{
|
|
|
void *ret;
|
|
|
|
|
|
- ret = __cache_alloc_node(cachep, flags, nodeid, _RET_IP);
|
|
|
+ ret = slab_alloc_node(cachep, flags, nodeid, _RET_IP);
|
|
|
|
|
|
trace_kmalloc_node(_RET_IP_, ret,
|
|
|
size, cachep->size,
|
|
@@ -3932,7 +3932,7 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
|
|
|
cachep = __find_general_cachep(size, flags);
|
|
|
if (unlikely(ZERO_OR_NULL_PTR(cachep)))
|
|
|
return cachep;
|
|
|
- ret = __cache_alloc(cachep, flags, caller);
|
|
|
+ ret = slab_alloc(cachep, flags, caller);
|
|
|
|
|
|
trace_kmalloc(caller, ret,
|
|
|
size, cachep->size, flags);
|