Commit 170b25fa authored Jan 16, 2020 by Mark Rutland Committed by Will Deacon Jan 17, 2020

arm64: assembler: remove inherit_daif macro



We haven't needed the inherit_daif macro since commit:

  ed3768db ("arm64: entry: convert el1_sync to C")

... which converted all callers to C and the local_daif_inherit
function.

Remove the unused macro.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>

parent 46cf053e

arch/arm64/include/asm/assembler.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -40,12 +40,6 @@
		msr daif, \flags
		.endm

		/* Only on aarch64 pstate, PSR_D_BIT is different for aarch32 */
		.macro inherit_daif, pstate:req, tmp:req
		and \tmp, \pstate, #(PSR_D_BIT \| PSR_A_BIT \| PSR_I_BIT \| PSR_F_BIT)
		msr daif, \tmp
		.endm

		/* IRQ is the lowest priority flag, unconditionally unmask the rest. */
		.macro enable_da_f
		msr daifclr, #(8 \| 4 \| 1)

Admin message