Commit 18547925 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Merge branch 'ib/6.9-disable-irq-guard' into next

This brings in support for guard(disable_irq)(...);
parents 7ba38c2a c7649476
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/cleanup.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <linux/irqnr.h> #include <linux/irqnr.h>
...@@ -235,6 +236,9 @@ extern void enable_percpu_irq(unsigned int irq, unsigned int type); ...@@ -235,6 +236,9 @@ extern void enable_percpu_irq(unsigned int irq, unsigned int type);
extern bool irq_percpu_is_enabled(unsigned int irq); extern bool irq_percpu_is_enabled(unsigned int irq);
extern void irq_wake_thread(unsigned int irq, void *dev_id); extern void irq_wake_thread(unsigned int irq, void *dev_id);
DEFINE_LOCK_GUARD_1(disable_irq, int,
disable_irq(*_T->lock), enable_irq(*_T->lock))
extern void disable_nmi_nosync(unsigned int irq); extern void disable_nmi_nosync(unsigned int irq);
extern void disable_percpu_nmi(unsigned int irq); extern void disable_percpu_nmi(unsigned int irq);
extern void enable_nmi(unsigned int irq); extern void enable_nmi(unsigned int irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment