浏览代码

Merge tag 'perf-urgent-for-mingo-4.11-20170317' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

- Fix symbols__fixup_end heuristic for corner cases, such as JITted eBPF
  programs, that are loaded at page aligned addresses, just after the
  kernel proper (Daniel Borkmann)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar 8 年之前
父节点
当前提交
a01851faab
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      tools/perf/util/symbol.c

+ 1 - 1
tools/perf/util/symbol.c

@@ -202,7 +202,7 @@ void symbols__fixup_end(struct rb_root *symbols)
 
 
 	/* Last entry */
 	/* Last entry */
 	if (curr->end == curr->start)
 	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)
 void __map_groups__fixup_end(struct map_groups *mg, enum map_type type)