diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/irq.h | 11 | ||||
-rw-r--r-- | include/linux/irqdesc.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index baa397eb9c33..16d6f54ef1dd 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
24 | #include <linux/topology.h> | 24 | #include <linux/topology.h> |
25 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
26 | #include <linux/module.h> | ||
26 | 27 | ||
27 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
28 | #include <asm/ptrace.h> | 29 | #include <asm/ptrace.h> |
@@ -546,7 +547,15 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d) | |||
546 | return d->msi_desc; | 547 | return d->msi_desc; |
547 | } | 548 | } |
548 | 549 | ||
549 | int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node); | 550 | int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node, |
551 | struct module *owner); | ||
552 | |||
553 | static inline int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, | ||
554 | int node) | ||
555 | { | ||
556 | return __irq_alloc_descs(irq, from, cnt, node, THIS_MODULE); | ||
557 | } | ||
558 | |||
550 | void irq_free_descs(unsigned int irq, unsigned int cnt); | 559 | void irq_free_descs(unsigned int irq, unsigned int cnt); |
551 | int irq_reserve_irqs(unsigned int from, unsigned int cnt); | 560 | int irq_reserve_irqs(unsigned int from, unsigned int cnt); |
552 | 561 | ||
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index 2d921b35212c..150134ac709a 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h | |||
@@ -66,6 +66,7 @@ struct irq_desc { | |||
66 | #ifdef CONFIG_PROC_FS | 66 | #ifdef CONFIG_PROC_FS |
67 | struct proc_dir_entry *dir; | 67 | struct proc_dir_entry *dir; |
68 | #endif | 68 | #endif |
69 | struct module *owner; | ||
69 | const char *name; | 70 | const char *name; |
70 | } ____cacheline_internodealigned_in_smp; | 71 | } ____cacheline_internodealigned_in_smp; |
71 | 72 | ||