arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block
authorWill Deacon <will.deacon@arm.com>
Wed, 21 Nov 2018 15:07:00 +0000 (15:07 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 23 Nov 2018 18:44:16 +0000 (18:44 +0000)
commit4f9f49646a5733c0c2bd49940673dde89a9c5add
tree8b97582d7df983e4a364554868a27b542e6c50d9
parentb5d9a07ef7736b2456b9d3c90568de25e43d8ec3
arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block

When merging support for SSBD and the CRC32 instructions, the conflict
resolution for the new capability entries in arm64_features[]
inadvertedly predicated the availability of the CRC32 instructions on
CONFIG_ARM64_SSBD, despite the functionality being entirely unrelated.

Move the #ifdef CONFIG_ARM64_SSBD down so that it only covers the SSBD
capability.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/cpufeature.c