Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-3
+2
-2
arch/arm64/include/asm/sysreg.h
+2
-2
arch/arm64/include/asm/sysreg.h
···
468
468
SCTLR_ELx_SA | SCTLR_ELx_I | SCTLR_ELx_WXN | \
469
469
SCTLR_ELx_DSSBS | ENDIAN_CLEAR_EL2 | SCTLR_EL2_RES0)
470
470
471
-
#if (SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != 0xffffffffffffffff
471
+
#if (SCTLR_EL2_SET ^ SCTLR_EL2_CLEAR) != 0xffffffffffffffffUL
472
472
#error "Inconsistent SCTLR_EL2 set/clear bits"
473
473
#endif
474
474
···
509
509
SCTLR_EL1_UMA | SCTLR_ELx_WXN | ENDIAN_CLEAR_EL1 |\
510
510
SCTLR_ELx_DSSBS | SCTLR_EL1_NTWI | SCTLR_EL1_RES0)
511
511
512
-
#if (SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != 0xffffffffffffffff
512
+
#if (SCTLR_EL1_SET ^ SCTLR_EL1_CLEAR) != 0xffffffffffffffffUL
513
513
#error "Inconsistent SCTLR_EL1 set/clear bits"
514
514
#endif
515
515
+1
-1
arch/arm64/kernel/cpufeature.c
+1
-1
arch/arm64/kernel/cpufeature.c
···
1333
1333
.cpu_enable = cpu_enable_hw_dbm,
1334
1334
},
1335
1335
#endif
1336
-
#ifdef CONFIG_ARM64_SSBD
1337
1336
{
1338
1337
.desc = "CRC32 instructions",
1339
1338
.capability = ARM64_HAS_CRC32,
···
1342
1343
.field_pos = ID_AA64ISAR0_CRC32_SHIFT,
1343
1344
.min_field_value = 1,
1344
1345
},
1346
+
#ifdef CONFIG_ARM64_SSBD
1345
1347
{
1346
1348
.desc = "Speculative Store Bypassing Safe (SSBS)",
1347
1349
.capability = ARM64_SSBS,