perf fixes

GIT PULL Ingo Molnar 1 participant 1 message May 24, 2011 perf events

lore

Share & tools

lore

Ingo Molnar

author

2011-05-24 02:42 UTC #0 lore raw

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

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

Thanks,

Ingo

------------------>
Frederic Weisbecker (1):
perf tools: Fix sample type size calculation in 32 bits archs

Jesper Juhl (1):
profile: Use vzalloc() rather than vmalloc() & memset()

 kernel/profile.c        |    6 ++----
 tools/perf/util/event.c |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

kernel/profile.c +2 -4

index 66f841b..14c9f87 100644
@@ -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;

tools/perf/util/event.c +1 -1

index 252b72a..6635fcd 100644
@@ -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++;
 	}