diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:19:59 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:19:59 +0200 |
| commit | c1d2a6fa7e3635a0ac4e2a7cbe7ccbc2059b6968 (patch) | |
| tree | 15a6a12998f4d638a02a6cdcbaf5c418f7fc6ef8 /include/linux | |
| parent | b9b41da981217b17e1e9171a781c65ae8dde1688 (diff) | |
| parent | 89b6869b942b8730467f2a0760ea466044aa52d2 (diff) | |
Merge tag 'v5.4.156' into HEAD
This is the 5.4.156 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/elfcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h index b81f9e1d74b0..9d249dfbab72 100644 --- a/include/linux/elfcore.h +++ b/include/linux/elfcore.h @@ -58,7 +58,7 @@ static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregse } #endif -#if defined(CONFIG_UM) || defined(CONFIG_IA64) +#if (defined(CONFIG_UML) && defined(CONFIG_X86_32)) || defined(CONFIG_IA64) /* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its |