diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:28:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:28:16 -0400 |
| commit | 2fd7476de999124bbf6830aa59ac092c882280fe (patch) | |
| tree | 81522f679ccdf38067e03102d2b64e44fc777204 /arch/x86/include | |
| parent | ba1a96fc7ddcaf0c8d4a6752f6a70f080bc307ac (diff) | |
| parent | 4ea48a01bb1a99f4185b77cd90cf962730336cc4 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc smaller fixes that missed the v3.17 cycle"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Add arch/x86/purgatory/ make generated files to gitignore
x86: Fix section conflict for numachip
x86: Reject x32 executables if x32 ABI not supported
x86_64, entry: Filter RFLAGS.NT on entry from userspace
x86, boot, kaslr: Fix nuisance warning on 32-bit builds
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/elf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index 1a055c81d864..ca3347a9dab5 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h | |||
| @@ -160,8 +160,9 @@ do { \ | |||
| 160 | #define elf_check_arch(x) \ | 160 | #define elf_check_arch(x) \ |
| 161 | ((x)->e_machine == EM_X86_64) | 161 | ((x)->e_machine == EM_X86_64) |
| 162 | 162 | ||
| 163 | #define compat_elf_check_arch(x) \ | 163 | #define compat_elf_check_arch(x) \ |
| 164 | (elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64) | 164 | (elf_check_arch_ia32(x) || \ |
| 165 | (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) | ||
| 165 | 166 | ||
| 166 | #if __USER32_DS != __USER_DS | 167 | #if __USER32_DS != __USER_DS |
| 167 | # error "The following code assumes __USER32_DS == __USER_DS" | 168 | # error "The following code assumes __USER32_DS == __USER_DS" |