diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-11-16 20:51:59 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-11-16 20:51:59 +0100 |
| commit | 4cffe21d4a6272ae905b3e915778b1fb1300f267 (patch) | |
| tree | cefe7d2d63a635805d20e7f11699678de8fc9419 /fs/compat_binfmt_elf.c | |
| parent | 78a56e0494ad29feccd4c54c2b5682721f8cb988 (diff) | |
| parent | c8d5ed67936fddbe2ae845fc80397718006322d7 (diff) | |
| download | linux-4cffe21d4a6272ae905b3e915778b1fb1300f267.tar.bz2 | |
Merge branch 'x86/entry' into core/entry
Prepare for the merging of the syscall_work series which conflicts with the
TIF bits overhaul in X86.
Diffstat (limited to 'fs/compat_binfmt_elf.c')
| -rw-r--r-- | fs/compat_binfmt_elf.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index 2d24c765cbd7..2c557229696a 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -106,15 +106,25 @@ #endif #ifdef compat_start_thread -#undef start_thread -#define start_thread compat_start_thread +#define COMPAT_START_THREAD(ex, regs, new_ip, new_sp) \ + compat_start_thread(regs, new_ip, new_sp) #endif -#ifdef compat_arch_setup_additional_pages +#ifdef COMPAT_START_THREAD +#undef START_THREAD +#define START_THREAD COMPAT_START_THREAD +#endif + +#ifdef compat_arch_setup_additional_pages +#define COMPAT_ARCH_SETUP_ADDITIONAL_PAGES(bprm, ex, interpreter) \ + compat_arch_setup_additional_pages(bprm, interpreter) +#endif + +#ifdef COMPAT_ARCH_SETUP_ADDITIONAL_PAGES #undef ARCH_HAS_SETUP_ADDITIONAL_PAGES #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 -#undef arch_setup_additional_pages -#define arch_setup_additional_pages compat_arch_setup_additional_pages +#undef ARCH_SETUP_ADDITIONAL_PAGES +#define ARCH_SETUP_ADDITIONAL_PAGES COMPAT_ARCH_SETUP_ADDITIONAL_PAGES #endif #ifdef compat_elf_read_implies_exec |