1 files changed, 6 insertions, 2 deletions

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index c52b737ab8e3..a92b33593b8d 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -680,6 +680,8 @@ int __handle_domain_irq(struct irq_domain *domain, unsigned int hwirq,
  * @hwirq:      The HW irq number to convert to a logical one
  * @regs:       Register file coming from the low-level handling code
  *
+ *              This function must be called from an NMI context.
+ *
  * Returns:     0 on success, or -EINVAL if conversion has failed
  */
 int handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq,
@@ -689,7 +691,10 @@ int handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq,
         unsigned int irq;
         int ret = 0;
 
-        nmi_enter();
+        /*
+         * NMI context needs to be setup earlier in order to deal with tracing.
+         */
+        WARN_ON(!in_nmi());
 
         irq = irq_find_mapping(domain, hwirq);
 
@@ -702,7 +707,6 @@ int handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq,
         else
                 ret = -EINVAL;
 
-        nmi_exit();
         set_irq_regs(old_regs);
         return ret;
 }