summaryrefslogtreecommitdiff
path: root/arch/nds32/include/asm/irqflags.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 08:11:45 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-31 08:11:45 +0300
commit5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2 (patch)
tree777c39ad4586149de154be3c4c102f751336a37b /arch/nds32/include/asm/irqflags.h
parent3ed8e1c2ac9914a2fcb08ec13476b85319536cea (diff)
parentf75aef392f869018f78cfedf3c320a6b3fcfda6b (diff)
downloadlinux-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.tar.xz
Merge 5.9-rc3 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/nds32/include/asm/irqflags.h')
-rw-r--r--arch/nds32/include/asm/irqflags.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/nds32/include/asm/irqflags.h b/arch/nds32/include/asm/irqflags.h
index fb45ec46bb1b..51ef800bb301 100644
--- a/arch/nds32/include/asm/irqflags.h
+++ b/arch/nds32/include/asm/irqflags.h
@@ -34,3 +34,8 @@ static inline int arch_irqs_disabled_flags(unsigned long flags)
{
return !flags;
}
+
+static inline int arch_irqs_disabled(void)
+{
+ return arch_irqs_disabled_flags(arch_local_save_flags());
+}