Skip to content

Commit

Permalink
kmsan: mm: fixup "call KMSAN hooks from SLUB code"
Browse files Browse the repository at this point in the history
revert unrelated whitespace changes
  • Loading branch information
ramosian-glider committed Nov 5, 2019
1 parent 6f88939 commit c235b34
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mm/slub.c
Expand Up @@ -2825,7 +2825,6 @@ void *kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size)
void *ret = slab_alloc(s, gfpflags, _RET_IP_);
trace_kmalloc(_RET_IP_, ret, size, s->size, gfpflags);
ret = kasan_kmalloc(s, ret, size, gfpflags);

return ret;
}
EXPORT_SYMBOL(kmem_cache_alloc_trace);
Expand All @@ -2838,6 +2837,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node)

trace_kmem_cache_alloc_node(_RET_IP_, ret,
s->object_size, s->size, gfpflags, node);

return ret;
}
EXPORT_SYMBOL(kmem_cache_alloc_node);
Expand All @@ -2853,7 +2853,6 @@ void *kmem_cache_alloc_node_trace(struct kmem_cache *s,
size, s->size, gfpflags, node);

ret = kasan_kmalloc(s, ret, size, gfpflags);

return ret;
}
EXPORT_SYMBOL(kmem_cache_alloc_node_trace);
Expand Down

0 comments on commit c235b34

Please sign in to comment.