Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d146194f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas::

 - Fix wrong conflict resolution around CONFIG_ARM64_SSBD

 - Fix sparse warning on unsigned long constant

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block
  arm64: sysreg: fix sparse warnings
parents 857fa628 4f9f4964

arch/arm64/include/asm/sysreg.h

+2 −2
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ 
			 SCTLR_ELx_SA     | SCTLR_ELx_I    | SCTLR_ELx_WXN | \

			 SCTLR_ELx_DSSBS | ENDIAN_CLEAR_EL2 | SCTLR_EL2_RES0)



#if (SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != 0xffffffffffffffff

#if (SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != 0xffffffffffffffffUL

#error "Inconsistent SCTLR_EL2 set/clear bits"

#endif
@@ -509,7 +509,7 @@ 
			 SCTLR_EL1_UMA | SCTLR_ELx_WXN     | ENDIAN_CLEAR_EL1 |\

			 SCTLR_ELx_DSSBS | SCTLR_EL1_NTWI  | SCTLR_EL1_RES0)



#if (SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != 0xffffffffffffffff

#if (SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != 0xffffffffffffffffUL

#error "Inconsistent SCTLR_EL1 set/clear bits"

#endif

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,6 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.cpu_enable = cpu_enable_hw_dbm,

	},

#endif

#ifdef CONFIG_ARM64_SSBD

	{

		.desc = "CRC32 instructions",

		.capability = ARM64_HAS_CRC32,
@@ -1343,6 +1342,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.field_pos = ID_AA64ISAR0_CRC32_SHIFT,

		.min_field_value = 1,

	},

#ifdef CONFIG_ARM64_SSBD

	{

		.desc = "Speculative Store Bypassing Safe (SSBS)",

		.capability = ARM64_SSBS,