diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-03-31 10:48:00 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-03-31 10:48:00 +0300 |
commit | 9005615bafbe03075f4e4fe10874b7abe1918782 (patch) | |
tree | 25e73a4d8de8266346bb140b75ba0436080e5ab3 /tools/perf | |
parent | 016da20148a1692e34d35d1f1787400a2a2d2c58 (diff) | |
parent | 0107042768658fea9f5f5a9c00b1c90f5dab6a06 (diff) | |
download | linux-9005615bafbe03075f4e4fe10874b7abe1918782.tar.xz |
Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping changes from John Stultz:
Main changes are the initial steps of Nicoli's work to make the clockevent
timers be corrected for NTP adjustments. Then a few smaller fixes that
I've queued, and adding Stephen Boyd to the maintainers list for
timekeeping.
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/util/symbol.c | 2 |
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) |