diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 14:30:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 14:30:01 -0400 |
| commit | 2453d6ff6ffc5f0d496b7b14f509a26f99bf115e (patch) | |
| tree | 9e4e709bdb932889b0b9cfc5b2b767cfcf750b83 /include | |
| parent | 12e24f34cb0d55efd08c18b2112507d4bf498008 (diff) | |
| parent | ab33dcff40d7a9a28587e4425621e4cbc4089e03 (diff) | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq, irq.h: Fix kernel-doc warnings
genirq: fix comment to say IRQ_WAKE_THREAD
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 1e50c34f0062..cb2e77a3f7f7 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -157,7 +157,7 @@ struct irq_2_iommu; | |||
| 157 | * @irqs_unhandled: stats field for spurious unhandled interrupts | 157 | * @irqs_unhandled: stats field for spurious unhandled interrupts |
| 158 | * @lock: locking for SMP | 158 | * @lock: locking for SMP |
| 159 | * @affinity: IRQ affinity on SMP | 159 | * @affinity: IRQ affinity on SMP |
| 160 | * @cpu: cpu index useful for balancing | 160 | * @node: node index useful for balancing |
| 161 | * @pending_mask: pending rebalanced interrupts | 161 | * @pending_mask: pending rebalanced interrupts |
| 162 | * @threads_active: number of irqaction threads currently running | 162 | * @threads_active: number of irqaction threads currently running |
| 163 | * @wait_for_threads: wait queue for sync_irq to wait for threaded handlers | 163 | * @wait_for_threads: wait queue for sync_irq to wait for threaded handlers |
| @@ -423,7 +423,7 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry); | |||
| 423 | /** | 423 | /** |
| 424 | * alloc_desc_masks - allocate cpumasks for irq_desc | 424 | * alloc_desc_masks - allocate cpumasks for irq_desc |
| 425 | * @desc: pointer to irq_desc struct | 425 | * @desc: pointer to irq_desc struct |
| 426 | * @cpu: cpu which will be handling the cpumasks | 426 | * @node: node which will be handling the cpumasks |
| 427 | * @boot: true if need bootmem | 427 | * @boot: true if need bootmem |
| 428 | * | 428 | * |
| 429 | * Allocates affinity and pending_mask cpumask if required. | 429 | * Allocates affinity and pending_mask cpumask if required. |