Skip to content

Commit 9eef29d

Browse files
mrutland-armctmarinas
authored andcommitted
arm64: entry: remove test_irqs_unmasked macro
We haven't needed the test_irqs_unmasked macro since commit: 105fc33 ("arm64: entry: move el1 irq/nmi logic to C") ... and as we convert more of the entry logic to C it is decreasingly likely we'll need it in future, so let's remove the unused macro. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <[email protected]> Cc: James Morse <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Will Deacon <[email protected]> Acked-by: Marc Zyngier <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 98c5ec7 commit 9eef29d

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

arch/arm64/kernel/entry.S

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -499,20 +499,6 @@ tsk .req x28 // current thread_info
499499
irq_stack_exit
500500
.endm
501501

502-
#ifdef CONFIG_ARM64_PSEUDO_NMI
503-
/*
504-
* Set res to 0 if irqs were unmasked in interrupted context.
505-
* Otherwise set res to non-0 value.
506-
*/
507-
.macro test_irqs_unmasked res:req, pmr:req
508-
alternative_if ARM64_HAS_IRQ_PRIO_MASKING
509-
sub \res, \pmr, #GIC_PRIO_IRQON
510-
alternative_else
511-
mov \res, xzr
512-
alternative_endif
513-
.endm
514-
#endif
515-
516502
.macro gic_prio_kentry_setup, tmp:req
517503
#ifdef CONFIG_ARM64_PSEUDO_NMI
518504
alternative_if ARM64_HAS_IRQ_PRIO_MASKING

0 commit comments

Comments
 (0)