Merge branch 'core/locking' into tracing/ftrace

This commit is contained in:
Ingo Molnar 2009-03-04 18:49:19 +01:00
commit 28b1bd1cbc
22 changed files with 716 additions and 381 deletions

View file

@ -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;