Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source 
* '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()
This commit is contained in:
Linus Torvalds 2011-05-23 21:20:48 -07:00
commit 5214638384
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/profile.c
View file

@ -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;

2
tools/perf/util/event.c
View file

@ -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++;
}