aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-05-23 10:15:43 -0400
committerIngo Molnar <mingo@elte.hu>2011-05-23 10:15:58 -0400
commit8ce26169555cf5634263d39d3665e45300218a5e (patch)
treefa3dcd7da5af214001e9952bb376e4f0ead8c841
parent3cb6d1540880e767d911b79eb49578de2190f428 (diff)
parent559fa6e76b271b98ff641fa2a968aa2439e43c28 (diff)
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 <mingo@elte.hu>
-rw-r--r--kernel/profile.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/profile.c b/kernel/profile.c
index 66f841b7fbd3..14c9f87b9fc9 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -126,11 +126,9 @@ int __ref profile_init(void)
126 if (prof_buffer) 126 if (prof_buffer)
127 return 0; 127 return 0;
128 128
129 prof_buffer = vmalloc(buffer_bytes); 129 prof_buffer = vzalloc(buffer_bytes);
130 if (prof_buffer) { 130 if (prof_buffer)
131 memset(prof_buffer, 0, buffer_bytes);
132 return 0; 131 return 0;
133 }
134 132
135 free_cpumask_var(prof_cpu_mask); 133 free_cpumask_var(prof_cpu_mask);
136 return -ENOMEM; 134 return -ENOMEM;