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:
Коммит
8ce2616955
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче