Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[mirror_ubuntu-artful-kernel.git] / include / linux / irqdesc.h

diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index d425a3a097227ed7e3e83c6fbfb8219cab55d9ed..3e90a094798d2955054db8f8bee381cb07dcfde9 100644 (file)
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -3,6 +3,7 @@
 
 #include <linux/rcupdate.h>
 #include <linux/kobject.h>
+#include <linux/mutex.h>
 
 /*
  * Core internal functions to deal with irq descriptors
@@ -45,6 +46,7 @@ struct pt_regs;
  *                     IRQF_FORCE_RESUME set
  * @rcu:               rcu head for delayed free
  * @kobj:              kobject used to represent this struct in sysfs
+ * @request_mutex:     mutex to protect request/free before locking desc->lock
  * @dir:               /proc/irq/ procfs entry
  * @debugfs_file:      dentry for the debugfs file
  * @name:              flow handler name for /proc/interrupts output
@@ -96,6 +98,7 @@ struct irq_desc {
        struct rcu_head         rcu;
        struct kobject          kobj;
 #endif
+       struct mutex            request_mutex;
        int                     parent_irq;
        struct module           *owner;
        const char              *name;