diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 06:20:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 06:20:48 +0200 |
| commit | 5214638384a968574a5ea3df1d3b3194da32a496 (patch) | |
| tree | f0defc396d154c35cd57692c33e7596cd314a93b | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | perf tools: Fix sample type size calculation in 32 bits archs (diff) | |
| download | linux-5214638384a968574a5ea3df1d3b3194da32a496.tar.xz linux-5214638384a968574a5ea3df1d3b3194da32a496.zip | |
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()
| -rw-r--r-- | kernel/profile.c | 6 | ||||
| -rw-r--r-- | tools/perf/util/event.c | 2 |
2 files changed, 3 insertions, 5 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) 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; diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 252b72a5e59e..6635fcd11ca5 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -42,7 +42,7 @@ int perf_sample_size(u64 sample_type) int i; for (i = 0; i < 64; i++) { - if (mask & (1UL << i)) + if (mask & (1ULL << i)) size++; } |