diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-18 13:11:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-18 13:11:51 +0200 |
| commit | 5804b11034a21e4287daaf017c5ad60ad7af8d67 (patch) | |
| tree | 79dd4998b58e3124bc2e5749914e4046afe5d0fd /fs | |
| parent | 13e091b6dd0e78a518a7d8756607d3acb8215768 (diff) | |
| parent | 6855dc41b24619c3d1de3dbd27dd0546b0e45272 (diff) | |
| download | linux-stable-5804b11034a21e4287daaf017c5ad60ad7af8d67.tar.gz linux-stable-5804b11034a21e4287daaf017c5ad60ad7af8d67.tar.bz2 linux-stable-5804b11034a21e4287daaf017c5ad60ad7af8d67.zip | |
Merge tag 'perf-core-for-mingo-4.19-20180815' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
kernel:
- kallsyms, x86: Export addresses of PTI entry trampolines (Alexander Shishkin)
- kallsyms: Simplify update_iter_mod() (Adrian Hunter)
- x86: Add entry trampolines to kcore (Adrian Hunter)
Hardware tracing:
- Fix auxtrace queue resize (Adrian Hunter)
Arch specific:
- Fix uninitialized ARM SPE record error variable (Kim Phillips)
- Fix trace event post-processing in powerpc (Sandipan Das)
Build:
- Fix check-headers.sh AND list path of execution (Alexander Kapshuk)
- Remove -mcet and -fcf-protection when building the python binding
with older clang versions (Arnaldo Carvalho de Melo)
- Make check-headers.sh check based on kernel dir (Jiri Olsa)
- Move syscall_64.tbl check into check-headers.sh (Jiri Olsa)
Infrastructure:
- Check for null when copying nsinfo. (Benno Evers)
Libraries:
- Rename libtraceevent prefixes, prep work for making it a shared
library generaly available (Tzvetomir Stoyanov (VMware))
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/kcore.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index e64ecb9f2720..00282f134336 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -383,8 +383,11 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) phdr->p_type = PT_LOAD; phdr->p_flags = PF_R|PF_W|PF_X; phdr->p_offset = kc_vaddr_to_offset(m->addr) + dataoff; - phdr->p_vaddr = (size_t)m->addr; - if (m->type == KCORE_RAM || m->type == KCORE_TEXT) + if (m->type == KCORE_REMAP) + phdr->p_vaddr = (size_t)m->vaddr; + else + phdr->p_vaddr = (size_t)m->addr; + if (m->type == KCORE_RAM || m->type == KCORE_TEXT || m->type == KCORE_REMAP) phdr->p_paddr = __pa(m->addr); else phdr->p_paddr = (elf_addr_t)-1; |