diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:07 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-22 09:20:18 -0500 |
commit | 2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f (patch) | |
tree | ab89c74c09c2986fa01c25ad8e45989a48a18899 /tools/perf/util/event.c | |
parent | 7dae8c5209147ad06d424928a5f1ec45caa87691 (diff) | |
parent | 678a0222edc9da43a22145d68647500ee85e6c04 (diff) |
Merge branch 'lpc32xx/drivers' into next/drivers
* lpc32xx/drivers: (566 commits)
ARM: LPC32xx: ADC support for mach-lpc32xx
Includes an update to Linux 3.3-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 73ddaf06b8e7..2044324b755a 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -554,7 +554,7 @@ static int perf_event__process_kernel_mmap(struct perf_tool *tool __used, | |||
554 | 554 | ||
555 | is_kernel_mmap = memcmp(event->mmap.filename, | 555 | is_kernel_mmap = memcmp(event->mmap.filename, |
556 | kmmap_prefix, | 556 | kmmap_prefix, |
557 | strlen(kmmap_prefix)) == 0; | 557 | strlen(kmmap_prefix) - 1) == 0; |
558 | if (event->mmap.filename[0] == '/' || | 558 | if (event->mmap.filename[0] == '/' || |
559 | (!is_kernel_mmap && event->mmap.filename[0] == '[')) { | 559 | (!is_kernel_mmap && event->mmap.filename[0] == '[')) { |
560 | 560 | ||