aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2014-02-19 16:29:40 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-02-25 06:40:50 -0500
commit8258a9895c99cdaacad8edc4748c0a624c710961 (patch)
treeda09fd689000370d04cd450867dab909fa08769a /arch/arm/kernel
parentb342ea4e4ff970518264c81eefd05f637e3f193a (diff)
ARM: 7982/1: introduce HWCAP2 feature bits for ARMv8 Crypto Extensions
This allocates feature bits 0-4 in HWCAP2 for the crypto and CRC extensions introduced in ARMv8. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index dbb5449d6b79..0a6c70b0b0f9 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1009,6 +1009,11 @@ static const char *hwcap_str[] = {
1009}; 1009};
1010 1010
1011static const char *hwcap2_str[] = { 1011static const char *hwcap2_str[] = {
1012 "aes",
1013 "pmull",
1014 "sha1",
1015 "sha2",
1016 "crc32",
1012 NULL 1017 NULL
1013}; 1018};
1014 1019