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

* '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

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 1e50c34f0062854ef167130ad349f1385adcb4d2..cb2e77a3f7f75a770a38b955d561aed8e77d3907 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -157,7 +157,7 @@ struct irq_2_iommu;
  * @irqs_unhandled:    stats field for spurious unhandled interrupts
  * @lock:              locking for SMP
  * @affinity:          IRQ affinity on SMP
- * @cpu:               cpu index useful for balancing
+ * @node:              node index useful for balancing
  * @pending_mask:      pending rebalanced interrupts
  * @threads_active:    number of irqaction threads currently running
  * @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);
 /**
  * alloc_desc_masks - allocate cpumasks for irq_desc
  * @desc:      pointer to irq_desc struct
- * @cpu:       cpu which will be handling the cpumasks
+ * @node:      node which will be handling the cpumasks
  * @boot:      true if need bootmem
  *
  * Allocates affinity and pending_mask cpumask if required.

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index aaf5c9d05770378b42acc2d41905ceb543f1f280..50da676729013dfe8dbc7929a4fdec16412f7780 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -856,7 +856,7 @@ EXPORT_SYMBOL(free_irq);
  *     still called in hard interrupt context and has to check
  *     whether the interrupt originates from the device. If yes it
  *     needs to disable the interrupt on the device and return
- *     IRQ_THREAD_WAKE which will wake up the handler thread and run
+ *     IRQ_WAKE_THREAD which will wake up the handler thread and run
  *     @thread_fn. This split handler design is necessary to support
  *     shared interrupts.
  *