Skip to content

Commit a82785a

Browse files
Julien Thierryctmarinas
authored andcommitted
arm64: Remove unused daif related functions/macros
There are some helpers to modify PSR.[DAIF] bits that are not referenced anywhere. The less these bits are available outside of local_irq_* functions the better. Get rid of those unused helpers. Signed-off-by: Julien Thierry <[email protected]> Reviewed-by: Mark Rutland <[email protected]> Acked-by: Catalin Marinas <[email protected]> Acked-by: Marc Zyngier <[email protected]> Cc: Will Deacon <[email protected]> Cc: James Morse <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent 5870970 commit a82785a

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

arch/arm64/include/asm/assembler.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,8 @@
6262
.endm
6363

6464
/*
65-
* Enable and disable interrupts.
65+
* Save/restore interrupts.
6666
*/
67-
.macro disable_irq
68-
msr daifset, #2
69-
.endm
70-
71-
.macro enable_irq
72-
msr daifclr, #2
73-
.endm
74-
7567
.macro save_and_disable_irq, flags
7668
mrs \flags, daif
7769
msr daifset, #2

arch/arm64/include/asm/daifflags.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ static inline unsigned long local_daif_save(void)
4343
return flags;
4444
}
4545

46-
static inline void local_daif_unmask(void)
47-
{
48-
trace_hardirqs_on();
49-
asm volatile(
50-
"msr daifclr, #0xf // local_daif_unmask"
51-
:
52-
:
53-
: "memory");
54-
}
55-
5646
static inline void local_daif_restore(unsigned long flags)
5747
{
5848
if (!arch_irqs_disabled_flags(flags))

0 commit comments

Comments
 (0)