diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-11-16 22:51:59 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-11-16 22:51:59 +0300 |
| commit | 4cffe21d4a6272ae905b3e915778b1fb1300f267 (patch) | |
| tree | cefe7d2d63a635805d20e7f11699678de8fc9419 /include/linux | |
| parent | 78a56e0494ad29feccd4c54c2b5682721f8cb988 (diff) | |
| parent | c8d5ed67936fddbe2ae845fc80397718006322d7 (diff) | |
| download | linux-4cffe21d4a6272ae905b3e915778b1fb1300f267.tar.xz | |
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 'include/linux')
| -rw-r--r-- | include/linux/elf.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index 5d5b0321da0b..c9a46c4e183b 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -22,6 +22,16 @@ SET_PERSONALITY(ex) #endif +#ifndef START_THREAD +#define START_THREAD(elf_ex, regs, elf_entry, start_stack) \ + start_thread(regs, elf_entry, start_stack) +#endif + +#if defined(ARCH_HAS_SETUP_ADDITIONAL_PAGES) && !defined(ARCH_SETUP_ADDITIONAL_PAGES) +#define ARCH_SETUP_ADDITIONAL_PAGES(bprm, ex, interpreter) \ + arch_setup_additional_pages(bprm, interpreter) +#endif + #define ELF32_GNU_PROPERTY_ALIGN 4 #define ELF64_GNU_PROPERTY_ALIGN 8 |