---

yaml --- r: 198019 b: refs/heads/master c: d3e14aa h: refs/heads/master i: 198017: cd5bcd9 198015: 9baf286 v: v3
git-mirror · May 22, 2010 · f1f9368 · f1f9368
1 parent 0f055fb
commit f1f9368
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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);