openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ingo Molnar 2011-05-23 16:15:43 +02:00
parent 3cb6d15408 559fa6e76b
commit 8ce2616955
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/profile.c
View File

@ -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;