diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 21:58:46 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 21:58:46 +0300 |
| commit | 0d3d031595cbac3d57a68e600a7facab1ecbdece (patch) | |
| tree | 646f566e88c221d9779b594ae17d699d85605f00 /include | |
| parent | dfd42facf1e4ada021b939b4e19c935dcdd55566 (diff) | |
| parent | 3a4f7ef4bed5bdc77a1ac8132f9f0650bbcb3eae (diff) | |
| download | linux-0d3d031595cbac3d57a68e600a7facab1ecbdece.tar.xz | |
Merge branch 'for-next/coredump' into for-next/core
* for-next/coredump:
arm64: Change elfcore for_each_mte_vma() to use VMA iterator
arm64: mte: Document the core dump file format
arm64: mte: Dump the MTE tags in the core file
arm64: mte: Define the number of bytes for storing the tags in a page
elf: Introduce the ARM MTE ELF segment type
elfcore: Replace CONFIG_{IA64, UML} checks with a new option
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/elfcore.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/elf.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h index 746e081879a5..f8e206e82476 100644 --- a/include/linux/elfcore.h +++ b/include/linux/elfcore.h @@ -114,7 +114,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg #endif } -#if (defined(CONFIG_UML) && defined(CONFIG_X86_32)) || defined(CONFIG_IA64) +#ifdef CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS /* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its @@ -149,6 +149,6 @@ static inline size_t elf_core_extra_data_size(void) { return 0; } -#endif +#endif /* CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS */ #endif /* _LINUX_ELFCORE_H */ diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 61bf4774b8f2..fe8e5b74cb39 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -40,6 +40,9 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_STACK (PT_LOOS + 0x474e551) +/* ARM MTE memory tag segment type */ +#define PT_ARM_MEMTAG_MTE (PT_LOPROC + 0x1) + /* * Extended Numbering * |