diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:47:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:47:07 +0100 |
| commit | 2737fce8bc8dea2852289df29b4f92e6a7fb7c91 (patch) | |
| tree | fd8198cd128aa99e87c73515a3330d57a097734c /arch/x86/kernel/cpu/perf_event_p6.c | |
| parent | 0d4dd797564cddc1f71ab0b239e9ea50ddd40b2a (diff) | |
| parent | d3b70220292c40d3b499797fd2f33f608fc35edb (diff) | |
| download | linux-2737fce8bc8dea2852289df29b4f92e6a7fb7c91.tar.gz | |
Merge tag 'perf-urgent-for-mingo' 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 annotation for relocated kernel (Adrian Hunter) * Fix demangling of symbols in kernel and kernel modules (Avi Kivity) * Fix include for non x86 architectures (Francesco Fusco) * Fix ARM64 memory barriers (Peter Zijlstra) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_p6.c')
0 files changed, 0 insertions, 0 deletions