forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'perf-urgent-for-mingo-20160726' of git://git.kernel.org/pu…
…b/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: - Fix obtaining the 'start' address for a kernel module on s390, where .text doesn't coincide with the start of the module as reported in /proc/modules (Song Shan Gong) - Use official ELF e_machine value for BPF objects generated via perf + LLVM when specifying BPF scriptlet in 'perf record/trace --event' (Wang Nan) Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
- Loading branch information
Showing
5 changed files
with
36 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,5 @@ libperf-y += header.o | |
libperf-y += kvm-stat.o | ||
|
||
libperf-$(CONFIG_DWARF) += dwarf-regs.o | ||
|
||
libperf-y += machine.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#include <unistd.h> | ||
#include <stdio.h> | ||
#include <string.h> | ||
#include "util.h" | ||
#include "machine.h" | ||
#include "api/fs/fs.h" | ||
|
||
int arch__fix_module_text_start(u64 *start, const char *name) | ||
{ | ||
char path[PATH_MAX]; | ||
|
||
snprintf(path, PATH_MAX, "module/%.*s/sections/.text", | ||
(int)strlen(name) - 2, name + 1); | ||
|
||
if (sysfs__read_ull(path, (unsigned long long *)start) < 0) | ||
return -1; | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters