Merge commit '559fa6e76b27' into perf/urgent

Merge reason: this commit was queued up quite some time ago but was forgotten about. Signed-off-by: Ingo Molnar <[email protected]>
faux123 · May 23, 2011 · 8ce2616 · 8ce2616
2 parents 3cb6d15 + 559fa6e
commit 8ce2616
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/kernel/profile.c b/kernel/profile.c
@@ -126,11 +126,9 @@ int __ref profile_init(void)
 	if (prof_buffer)
 		return 0;
 
-	prof_buffer = vmalloc(buffer_bytes);
-	if (prof_buffer) {
-		memset(prof_buffer, 0, buffer_bytes);
+	prof_buffer = vzalloc(buffer_bytes);
+	if (prof_buffer)
 		return 0;
-	}
 
 	free_cpumask_var(prof_cpu_mask);
 	return -ENOMEM;