diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-23 16:15:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-23 16:15:58 +0200 |
| commit | 8ce26169555cf5634263d39d3665e45300218a5e (patch) | |
| tree | fa3dcd7da5af214001e9952bb376e4f0ead8c841 /kernel | |
| parent | 3cb6d1540880e767d911b79eb49578de2190f428 (diff) | |
| parent | 559fa6e76b271b98ff641fa2a968aa2439e43c28 (diff) | |
| download | op-kernel-dev-8ce26169555cf5634263d39d3665e45300218a5e.zip op-kernel-dev-8ce26169555cf5634263d39d3665e45300218a5e.tar.gz | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/profile.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index 66f841b..14c9f87 100644 --- 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; |
