diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:33 +0000 |
| commit | 11a266d2e5e6b73bfba337fb3ef21c8fd4fa4150 (patch) | |
| tree | 3c4ca0079cb67feeaa6a678212ca6f4313cf5a69 /arch/x86/include/asm/elf.h | |
| parent | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (diff) | |
| parent | 9c3da88145da7cd96bb898bc0304d3f783d4c8b2 (diff) | |
Merge tag 'v3.14.24' into linux-linaro-lsk-v3.14
This is the 3.14.24 stable release
Diffstat (limited to 'arch/x86/include/asm/elf.h')
| -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 9c999c1674fa..01f15b227d7e 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h @@ -155,8 +155,9 @@ do { \ #define elf_check_arch(x) \ ((x)->e_machine == EM_X86_64) -#define compat_elf_check_arch(x) \ - (elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64) +#define compat_elf_check_arch(x) \ + (elf_check_arch_ia32(x) || \ + (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) #if __USER32_DS != __USER_DS # error "The following code assumes __USER32_DS == __USER_DS" |