From 93a6067a76179b0c554177da2155b9b0994deeea Mon Sep 17 00:00:00 2001 From: Rohit Vaswani Date: Mon, 4 Jan 2016 13:59:07 -0800 Subject: [PATCH] Revert "arm64: Remove unused macros from assembler.h" This reverts commit ("arm64: Remove unused macros from assembler.h") This is required for flush_cache_all to work. Change-Id: I469602e2f35b15bf13667322f3ffbe61dab90f91 Signed-off-by: Rohit Vaswani Signed-off-by: Elliot Berman --- arch/arm64/include/asm/assembler.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index ea337e56c6ce..b5ac5488a7ee 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -71,6 +71,18 @@ msr daif, \flags .endm +/* + * Save/disable and restore interrupts. + */ + .macro save_and_disable_irqs, olddaif + mrs \olddaif, daif + disable_irq + .endm + + .macro restore_irqs, olddaif + msr daif, \olddaif + .endm + .macro enable_dbg msr daifclr, #8 .endm