Commit 52146383 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'perf-urgent-for-linus' of...

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()
parents df462b3d 0f61f3e4
...@@ -126,11 +126,9 @@ int __ref profile_init(void) ...@@ -126,11 +126,9 @@ int __ref profile_init(void)
if (prof_buffer) if (prof_buffer)
return 0; return 0;
prof_buffer = vmalloc(buffer_bytes); prof_buffer = vzalloc(buffer_bytes);
if (prof_buffer) { if (prof_buffer)
memset(prof_buffer, 0, buffer_bytes);
return 0; return 0;
}
free_cpumask_var(prof_cpu_mask); free_cpumask_var(prof_cpu_mask);
return -ENOMEM; return -ENOMEM;
......
...@@ -42,7 +42,7 @@ int perf_sample_size(u64 sample_type) ...@@ -42,7 +42,7 @@ int perf_sample_size(u64 sample_type)
int i; int i;
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (mask & (1UL << i)) if (mask & (1ULL << i))
size++; size++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment