diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-13 07:40:25 -0700 |
| commit | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (patch) | |
| tree | f901bdcb5b20e93261cf9cf324ebbcf3fd24ce58 /tools/perf/util/event.c | |
| parent | 9d5ae7cd6cb9ead43336fec1094184d1dc740fbd (diff) | |
| parent | 345f79b3de7f6d651e4dba794af7c7303bdfd649 (diff) | |
| download | linux-next-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.tar.gz linux-next-c8e0bf95fc01d6e2ca585fe08010800b6c56e823.zip | |
Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 6635fcd11ca5..0fe9adf76379 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -553,9 +553,18 @@ static int perf_event__process_kernel_mmap(union perf_event *event, goto out_problem; perf_event__set_kernel_mmap_len(event, machine->vmlinux_maps); - perf_session__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, - symbol_name, - event->mmap.pgoff); + + /* + * Avoid using a zero address (kptr_restrict) for the ref reloc + * symbol. Effectively having zero here means that at record + * time /proc/sys/kernel/kptr_restrict was non zero. + */ + if (event->mmap.pgoff != 0) { + perf_session__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, + symbol_name, + event->mmap.pgoff); + } + if (machine__is_default_guest(machine)) { /* * preload dso of guest kernel and modules |