diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:47:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:47:48 -0500 |
| commit | 3d8b4bdef7e7c9d36ce90e563788c10051a91c34 (patch) | |
| tree | f98e4fc7cce54ea0b4b4466342c3ee06f9a7a9f7 /tools/perf/util | |
| parent | 724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff) | |
| parent | 1a72cfa6856e7d58e049c42c6e6a789669478479 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf top: Fix help text alignment
perf: Fix hypervisor sample reporting
perf: Make bp_len type to u64 generic across the arch
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index bb0fd6da2d56..8a9e6baa3099 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
| @@ -295,10 +295,10 @@ void thread__find_addr_location(struct thread *self, | |||
| 295 | al->thread = self; | 295 | al->thread = self; |
| 296 | al->addr = addr; | 296 | al->addr = addr; |
| 297 | 297 | ||
| 298 | if (cpumode & PERF_RECORD_MISC_KERNEL) { | 298 | if (cpumode == PERF_RECORD_MISC_KERNEL) { |
| 299 | al->level = 'k'; | 299 | al->level = 'k'; |
| 300 | mg = &session->kmaps; | 300 | mg = &session->kmaps; |
| 301 | } else if (cpumode & PERF_RECORD_MISC_USER) | 301 | } else if (cpumode == PERF_RECORD_MISC_USER) |
| 302 | al->level = '.'; | 302 | al->level = '.'; |
| 303 | else { | 303 | else { |
| 304 | al->level = 'H'; | 304 | al->level = 'H'; |
