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()

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 252b72a5e59..6635fcd11ca 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++;
         }