diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 21:20:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 21:20:48 -0700 |
| commit | 5214638384a968574a5ea3df1d3b3194da32a496 (patch) | |
| tree | f0defc396d154c35cd57692c33e7596cd314a93b /kernel | |
| parent | df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc (diff) | |
| parent | 0f61f3e4db71946292ef8d6d6df74b8fcf001646 (diff) | |
| download | kernel_samsung_smdk4412-5214638384a968574a5ea3df1d3b3194da32a496.zip kernel_samsung_smdk4412-5214638384a968574a5ea3df1d3b3194da32a496.tar.gz kernel_samsung_smdk4412-5214638384a968574a5ea3df1d3b3194da32a496.tar.bz2 | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Fix sample type size calculation in 32 bits archs
profile: Use vzalloc() rather than vmalloc() & memset()
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; |