From cfed41d1c005320b282f16aa4a66348a9d0511f8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 15 Mar 2009 06:03:11 +0100
Subject: [PATCH] --- yaml --- r: 139052 b: refs/heads/master c:
 19cefdffbfe0f7e280f21e80875937e8700e99e2 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slob.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)