diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-03-03 02:34:44 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-04 03:05:21 -0500 |
commit | 66d6e3b385778c2eef3b172a037235516207393e (patch) | |
tree | 3969dcd6d862beac98a6aef57841baddfc25688c /fs/compat_binfmt_elf.c | |
parent | bff705950e2cdcf35641dee35eb14bad9ed49e8f (diff) |
binfmt_elf: add ELF_HWCAP2 to compat auxv entries
Add ELF_HWCAP2 to the set of auxv entries that is passed to
a 32-bit ELF program running in 32-bit compat mode under a
64-bit kernel.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'fs/compat_binfmt_elf.c')
-rw-r--r-- | fs/compat_binfmt_elf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index a81147e2e4ef..4d24d17bcfc1 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c | |||
@@ -88,6 +88,11 @@ static void cputime_to_compat_timeval(const cputime_t cputime, | |||
88 | #define ELF_HWCAP COMPAT_ELF_HWCAP | 88 | #define ELF_HWCAP COMPAT_ELF_HWCAP |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #ifdef COMPAT_ELF_HWCAP2 | ||
92 | #undef ELF_HWCAP2 | ||
93 | #define ELF_HWCAP2 COMPAT_ELF_HWCAP2 | ||
94 | #endif | ||
95 | |||
91 | #ifdef COMPAT_ARCH_DLINFO | 96 | #ifdef COMPAT_ARCH_DLINFO |
92 | #undef ARCH_DLINFO | 97 | #undef ARCH_DLINFO |
93 | #define ARCH_DLINFO COMPAT_ARCH_DLINFO | 98 | #define ARCH_DLINFO COMPAT_ARCH_DLINFO |