git.baikalelectronics.ru Git - kernel.git/commit

author	Will Deacon <will.deacon@arm.com>
	Wed, 21 Nov 2018 15:07:00 +0000 (15:07 +0000)
committer	Catalin Marinas <catalin.marinas@arm.com>
	Fri, 23 Nov 2018 18:44:16 +0000 (18:44 +0000)
commit	28c5ddfa9844cc9c2df5fe2665d4d70930c35e16
tree	8b97582d7df983e4a364554868a27b542e6c50d9	tree \| snapshot
parent	29ebb97348f3167d161f65cbafdd95e782a82011	commit \| diff

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>