mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'core/locking' into tracing/ftrace
This commit is contained in:
commit
28b1bd1cbc
22 changed files with 716 additions and 381 deletions
|
|
@ -466,6 +466,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
|
|||
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
void *ret;
|
||||
|
||||
lockdep_trace_alloc(flags);
|
||||
|
||||
if (size < PAGE_SIZE - align) {
|
||||
if (!size)
|
||||
return ZERO_SIZE_PTR;
|
||||
|
|
|
|||
Loading…
Reference in a new issue