From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 4 Mar 2009 17:49:19 +0000 (+0100)
Subject: Merge branch 'core/locking' into tracing/ftrace
X-Git-Tag: v2.6.30-rc1~2^2~70^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=28b1bd1cbc33cae95a309691d814399a69cf3070;p=~shefty%2Frdma-dev.git

Merge branch 'core/locking' into tracing/ftrace
---

28b1bd1cbc33cae95a309691d814399a69cf3070
diff --cc mm/slob.c
index f9cc2468823,1264799df5d..596152926a8
--- a/mm/slob.c
+++ b/mm/slob.c
@@@ -464,8 -463,9 +464,10 @@@ void *__kmalloc_node(size_t size, gfp_
  {
  	unsigned int *m;
  	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;