---

yaml --- r: 300147 b: refs/heads/master c: 100d13c h: refs/heads/master i: 300145: acce6fe 300143: 1a3a4c8 v: v3
git-mirror · May 9, 2012 · e2d70c8 · e2d70c8
1 parent 7314cd8
commit e2d70c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42b64281453249dac52861f9b97d18552a7ec62b
+refs/heads/master: 100d13c3b5b9410f604b86f5e0a34da64b8cf659
diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c
@@ -1895,6 +1895,8 @@ void __init setup_per_cpu_areas(void)
 	fc = __alloc_bootmem(unit_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
 	if (!ai || !fc)
 		panic("Failed to allocate memory for percpu areas.");
+	/* kmemleak tracks the percpu allocations separately */
+	kmemleak_free(fc);
 
 	ai->dyn_size = unit_size;
 	ai->unit_size = unit_size;