From f1f936826068e80c72ba8f7c3065b86027046d6c Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng@redhat.com>
Date: Thu, 8 Apr 2010 17:26:44 +0800
Subject: [PATCH] --- yaml --- r: 198019 b: refs/heads/master c:
 d3e14aa336b37df76ae875fa051dfdb0e765ddf9 h: refs/heads/master i:   198017:
 cd5bcd9c78344e325ebfca7f797f88c64aed026a   198015:
 9baf286869935a923fc321230e554e185e514cc8 v: v3

---
 [refs]          |  2 +-
 trunk/mm/slub.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 309fe5a607bc..a76ac6c31ecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbd7d57bfe852d9788bae5fb171c7edb4021d8ac
+refs/heads/master: d3e14aa336b37df76ae875fa051dfdb0e765ddf9
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 78f1a202ca33..52ae5a538180 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3341,8 +3341,15 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
 	struct kmem_cache *s;
 	void *ret;
 
-	if (unlikely(size > SLUB_MAX_SIZE))
-		return kmalloc_large_node(size, gfpflags, node);
+	if (unlikely(size > SLUB_MAX_SIZE)) {
+		ret = kmalloc_large_node(size, gfpflags, node);
+
+		trace_kmalloc_node(caller, ret,
+				   size, PAGE_SIZE << get_order(size),
+				   gfpflags, node);
+
+		return ret;
+	}
 
 	s = get_slab(size, gfpflags);