diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-21 12:06:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-21 12:06:53 +0800 |
| commit | 317c5652a7c300c2d82ef5bfae8d3558f389d219 (patch) | |
| tree | 9cb4998f4275d8d551ab04cd33af32cf0266b3af /tools | |
| parent | 2cea360fea5e5e1cb69496612466be2b99254096 (diff) | |
| parent | 1b29aa698d3ef8826599dc856054640eb71d2e33 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/symbol.c | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/vm/Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 754711be8b25..237830873c71 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -200,7 +200,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) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index e4bb1de1d526..b5f08e8cab33 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -1,5 +1,9 @@ # Makefile for vm selftests +ifndef OUTPUT + OUTPUT := $(shell pwd) +endif + CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) BINARIES = compaction_test BINARIES += hugepage-mmap |