VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-06-05 13:45:21 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-06-05 13:45:21 -0700 commit: ac7b34218a0021bafd1d4c11c54217b930f516b0 parent: 7ae77150d94d3b535c7b85e6b3647113095e79bf

Commit Summary:

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

Diffstat:

1 file changed, 5 insertions, 0 deletions

diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
index e61f3fe8e32a..2d24c765cbd7 100644
--- 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