Merge tag 'regmap-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
index 2c55722..95e72d2 100644 (file)
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -50,6 +50,7 @@
  * which requires asm/elf.h to define compat_elf_gregset_t et al.
  */
 #define elf_prstatus   compat_elf_prstatus
+#define elf_prstatus_common    compat_elf_prstatus_common
 #define elf_prpsinfo   compat_elf_prpsinfo
 
 #undef ns_to_kernel_old_timeval
@@ -61,7 +62,6 @@
  * differ from the native ones, or omitted when they match.
  */
 
-#undef ELF_ARCH
 #undef elf_check_arch
 #define        elf_check_arch  compat_elf_check_arch
 
@@ -90,11 +90,6 @@
 #define        ELF_ET_DYN_BASE         COMPAT_ELF_ET_DYN_BASE
 #endif
 
-#ifdef COMPAT_ELF_EXEC_PAGESIZE
-#undef ELF_EXEC_PAGESIZE
-#define        ELF_EXEC_PAGESIZE       COMPAT_ELF_EXEC_PAGESIZE
-#endif
-
 #ifdef COMPAT_ELF_PLAT_INIT
 #undef ELF_PLAT_INIT
 #define        ELF_PLAT_INIT           COMPAT_ELF_PLAT_INIT