From: Julien Thierry <julien.thierry@arm.com>
Date: Tue, 28 Aug 2018 15:51:17 +0000 (+0100)
Subject: arm64: xen: Use existing helper to check interrupt status
X-Git-Tag: v5.15~7637^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0506a8bbb42a859f6d25b3ecc4b6da93bae8d5a;p=platform%2Fkernel%2Flinux-starfive.git

arm64: xen: Use existing helper to check interrupt status

The status of interrupts might depend on more than just pstate. Use
interrupts_disabled() instead of raw_irqs_disabled_flags() to take the full
context into account.

Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/include/asm/xen/events.h b/arch/arm64/include/asm/xen/events.h
index 4e22b7a..2788e95 100644
--- a/arch/arm64/include/asm/xen/events.h
+++ b/arch/arm64/include/asm/xen/events.h
@@ -14,7 +14,7 @@ enum ipi_vector {
 
 static inline int xen_irqs_disabled(struct pt_regs *regs)
 {
-	return raw_irqs_disabled_flags((unsigned long) regs->pstate);
+	return !interrupts_enabled(regs);
 }
 
 #define xchg_xen_ulong(ptr, val) xchg((ptr), (val))