diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-03-18 14:44:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-22 13:16:54 -0400 |
commit | c40e3641670eb6ebfdb71d4b0c775416ef95f4f0 (patch) | |
tree | 96ca09009712653d778ca06f0ba9229577430332 | |
parent | e651eab0af88aa7a281fe9e8c36c0846552aa7fc (diff) |
ARM: 7679/1: Clear IDIVT hwcap if CONFIG_ARM_THUMB=n
Don't advertise support for the SDIV/UDIV thumb instructions if
the kernel is not compiled with support for thumb userspace. This
is in line with how we remove the THUMB hwcap in these
configurations.
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 3f6cbb2e3eda..e2c8bbffb0b1 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -484,7 +484,7 @@ static void __init setup_processor(void) | |||
484 | list->elf_name, ENDIANNESS); | 484 | list->elf_name, ENDIANNESS); |
485 | elf_hwcap = list->elf_hwcap; | 485 | elf_hwcap = list->elf_hwcap; |
486 | #ifndef CONFIG_ARM_THUMB | 486 | #ifndef CONFIG_ARM_THUMB |
487 | elf_hwcap &= ~HWCAP_THUMB; | 487 | elf_hwcap &= ~(HWCAP_THUMB | HWCAP_IDIVT); |
488 | #endif | 488 | #endif |
489 | 489 | ||
490 | feat_v6_fixup(); | 490 | feat_v6_fixup(); |