diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2020-01-16 18:35:44 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-17 13:22:13 +0000 |
| commit | 170b25fa6aab84dc9bdba88d4c64af5fbb789b6b (patch) | |
| tree | da2b2767c9f31e1145955cebc2ea6107ef5c8cf2 /arch/arm64/include/asm/assembler.h | |
| parent | 46cf053efec6a3a5f343fead837777efe8252a46 (diff) | |
arm64: assembler: remove inherit_daif macro
We haven't needed the inherit_daif macro since commit:
ed3768db588291dd ("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>
Diffstat (limited to 'arch/arm64/include/asm/assembler.h')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index b8cf7c85ffa2..5f8a2772baeb 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -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) |