From: Will Deacon <will@kernel.org>
Date: Mon, 14 Mar 2022 19:01:23 +0000 (+0000)
Subject: Merge branch 'for-next/mte' into for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf587af2abd8c4ff630f260040f7d2722e37e054;p=linux.git

Merge branch 'for-next/mte' into for-next/core

* for-next/mte:
  docs: sysfs-devices-system-cpu: document "asymm" value for mte_tcf_preferred
  arm64/mte: Remove asymmetric mode from the prctl() interface
  kasan: fix a missing header include of static_keys.h
  arm64/mte: Add userspace interface for enabling asymmetric mode
  arm64/mte: Add hwcap for asymmetric mode
  arm64/mte: Add a little bit of documentation for mte_update_sctlr_user()
  arm64/mte: Document ABI for asymmetric mode
  arm64: mte: avoid clearing PSTATE.TCO on entry unless necessary
  kasan: split kasan_*enabled() functions into a separate header
---

bf587af2abd8c4ff630f260040f7d2722e37e054
diff --cc arch/arm64/kernel/entry.S
index eb59621d6c6a2,e1013a83d4f01..a3ee79bcd5cb6
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@@ -308,14 -307,6 +308,7 @@@ alternative_if ARM64_HAS_IRQ_PRIO_MASKI
  	mov	x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET
  	msr_s	SYS_ICC_PMR_EL1, x20
  alternative_else_nop_endif
- #endif
- 
- 	/* Re-enable tag checking (TCO set on exception entry) */
- #ifdef CONFIG_ARM64_MTE
- alternative_if ARM64_MTE
- 	SET_PSTATE_TCO(0)
- alternative_else_nop_endif
 +#endif
  
  	/*
  	 * Registers that may be useful after this macro is invoked: