Merge tag 'perf-urgent-for-mingo-20160726' of git://git.kernel.org/pub/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 <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>