Merge tag 'core_core_updates_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / compat_binfmt_elf.c

diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
index e61f3fe8e32a6a066565fa2a4633858f76a023a6..2d24c765cbd7aea5440a4e386ca343b9b5eb0383 100644 (file)
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -117,6 +117,11 @@
 #define        arch_setup_additional_pages compat_arch_setup_additional_pages
 #endif
 
+#ifdef compat_elf_read_implies_exec
+#undef elf_read_implies_exec
+#define        elf_read_implies_exec compat_elf_read_implies_exec
+#endif
+
 /*
  * Rename a few of the symbols that binfmt_elf.c will define.
  * These are all local so the names don't really matter, but it