diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /tools/perf/util/event.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'tools/perf/util/event.c')
-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 2b15c362ef56..1023f67633a4 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -710,7 +710,7 @@ try_again: | |||
710 | * in the whole kernel symbol list. | 710 | * in the whole kernel symbol list. |
711 | */ | 711 | */ |
712 | if ((long long)al->addr < 0 && | 712 | if ((long long)al->addr < 0 && |
713 | cpumode == PERF_RECORD_MISC_KERNEL && | 713 | cpumode == PERF_RECORD_MISC_USER && |
714 | machine && mg != &machine->kmaps) { | 714 | machine && mg != &machine->kmaps) { |
715 | mg = &machine->kmaps; | 715 | mg = &machine->kmaps; |
716 | goto try_again; | 716 | goto try_again; |