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	507a989c4a97f86ab5bd20f215f89ec9af7fe488
tree	8b97582d7df983e4a364554868a27b542e6c50d9	tree \| snapshot
parent	96556fb86280a22ab7e5dc1d774a77332965c2ee	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>