diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 21:20:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 21:20:48 -0700 |
| commit | 5214638384a968574a5ea3df1d3b3194da32a496 (patch) | |
| tree | f0defc396d154c35cd57692c33e7596cd314a93b /tools | |
| parent | df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc (diff) | |
| parent | 0f61f3e4db71946292ef8d6d6df74b8fcf001646 (diff) | |
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()
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/event.c | 2 |
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++; } |