diff options
| author | Daniel Thompson <daniel.thompson@linaro.org> | 2017-02-28 09:35:24 +0000 |
|---|---|---|
| committer | Daniel Thompson <daniel.thompson@linaro.org> | 2017-02-28 09:35:24 +0000 |
| commit | 3f5cd0650db43970803e3723f807288d1fc4706f (patch) | |
| tree | 83734e8b794037d811eb04cbc839f3a911395cb7 /arch/arm64/include/asm/irqflags.h | |
| parent | 3de38814c6b98ffe8c2b9e758fa2b40672f48e3c (diff) | |
fixup: PMR patch
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Diffstat (limited to 'arch/arm64/include/asm/irqflags.h')
| -rw-r--r-- | arch/arm64/include/asm/irqflags.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h index 7b6866022f82..585db64456c1 100644 --- a/arch/arm64/include/asm/irqflags.h +++ b/arch/arm64/include/asm/irqflags.h @@ -101,7 +101,7 @@ static inline unsigned long arch_local_irq_save(void) "// arch_local_irq_save\n" "mrs_s %0, " __stringify(ICC_PMR_EL1) "\n" "msr_s " __stringify(ICC_PMR_EL1) ",%1\n" - "isb\n" + "dsb sy\n" : "=&r" (flags) : "r" (masked) : "memory"); @@ -116,7 +116,7 @@ static inline void arch_local_irq_enable(void) asm volatile( "// arch_local_irq_enable\n" "msr_s " __stringify(ICC_PMR_EL1) ",%0\n" - "isb\n" + "dsb sy\n" : : "r" (unmasked) : "memory"); @@ -129,7 +129,7 @@ static inline void arch_local_irq_disable(void) asm volatile( "// arch_local_irq_disable\n" "msr_s " __stringify(ICC_PMR_EL1) ",%0\n" - "isb\n" + "dsb sy\n" : : "r" (masked) : "memory"); @@ -160,7 +160,7 @@ static inline void arch_local_irq_restore(unsigned long flags) asm volatile( "// arch_local_irq_restore\n" "msr_s " __stringify(ICC_PMR_EL1) ",%0\n" - "isb\n" + "dsb sy\n" : : "r" (flags) : "memory"); |