aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-04-12 21:59:01 -0700
committerDan Williams <dan.j.williams@intel.com>2017-04-12 21:59:01 -0700
commitbfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch)
treea50287c88fdc60a73912d205d7bce41b7af53827 /tools/perf
parentdevice-dax: utilize new cdev_device_add helper function (diff)
parentx86, pmem: fix broken __copy_user_nocache cache-bypass assumptions (diff)
downloadlinux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.tar.xz
linux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.zip
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/symbol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 70e389bc4af7..9b4d8ba22fed 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -202,7 +202,7 @@ void symbols__fixup_end(struct rb_root *symbols)
/* Last entry */
if (curr->end == curr->start)
- curr->end = roundup(curr->start, 4096);
+ curr->end = roundup(curr->start, 4096) + 4096;
}
void __map_groups__fixup_end(struct map_groups *mg, enum map_type type)