Skip to content

Commit 6ac96d6

Browse files
Anshuman Khandualwilldeacon
authored andcommitted
arm64/mm: Drop TCR_SMP_FLAGS
Earlier TCR_SMP_FLAGS gets conditionally set as TCR_SHARED with CONFIG_SMP. Currently CONFIG_SMP is always enabled on arm64 platforms, hence drop this indirection via TCR_SMP_FLAGS and instead always directly use TCR_SHARED. Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Anshuman Khandual <[email protected]> Reviewed-by: Ryan Roberts <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 4b6049b commit 6ac96d6

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/arm64/mm/proc.S

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#define TCR_KASLR_FLAGS 0
3737
#endif
3838

39-
#define TCR_SMP_FLAGS TCR_SHARED
40-
4139
/* PTWs cacheable, inner/outer WBWA */
4240
#define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA
4341

@@ -469,7 +467,7 @@ SYM_FUNC_START(__cpu_setup)
469467
tcr .req x16
470468
mov_q mair, MAIR_EL1_SET
471469
mov_q tcr, TCR_T0SZ(IDMAP_VA_BITS) | TCR_T1SZ(VA_BITS_MIN) | TCR_CACHE_FLAGS | \
472-
TCR_SMP_FLAGS | TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
470+
TCR_SHARED | TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \
473471
TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS | TCR_MTE_FLAGS
474472

475473
tcr_clear_errata_bits tcr, x9, x5

0 commit comments

Comments
 (0)