summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRohit Vaswani <rvaswani@codeaurora.org>2016-01-04 13:59:07 -0800
committerRohit Vaswani <rvaswani@codeaurora.org>2016-03-01 12:22:19 -0800
commit155800d0a885d3d69131a84a22fe1dffb5398776 (patch)
tree99b24be9bcd1d33c13c2bb8fc8eec12632e74d27 /arch
parentb04cd45a04469e70eddaa0ccddc462a5db6e6210 (diff)
Revert "arm64: Remove unused macros from assembler.h"
This reverts commit d3127afa712321a2b297cfee358be2cb223f933c. This is required for flush_cache_all to work.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/assembler.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 12eff928ef8b..09f13a96941b 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -50,6 +50,18 @@
.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
+
+/*
* Enable and disable debug exceptions.
*/
.macro disable_dbg