diff --git a/[refs] b/[refs] index a047cb827d56..a8e010c52f0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6700ec65c207068a81a535e9dca616fefac21671 +refs/heads/master: 19cefdffbfe0f7e280f21e80875937e8700e99e2 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 1264799df5d1..4b1c0c1d63cb 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -464,7 +464,7 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) unsigned int *m; int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); - lockdep_trace_alloc(flags); + lockdep_trace_alloc(gfp); if (size < PAGE_SIZE - align) { if (!size)