summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-24 10:24:52 +0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 10:24:52 +0400
commitd08fe475120e3f17df37656d0644c0f17a797852 (patch)
tree64f0324afa9e884d8f0d738930a2495ba411c897 /tools
parentfb66c5238547495b4a79f590b20400683702448a (diff)
parentd762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff)
downloadlinux-d08fe475120e3f17df37656d0644c0f17a797852.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/event.c2
1 files changed, 1 insertions, 1 deletions
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++;
}