Skip to contentSkip to conversation

IRQ fixes

GIT PULL Ingo Molnar 1 participant 1 message Jun 20, 2009 IRQ

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest irq-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus

Thanks,

Ingo

------------------>
Randy Dunlap (1):
genirq, irq.h: Fix kernel-doc warnings

Steven Rostedt (1):
genirq: fix comment to say IRQ_WAKE_THREAD

 include/linux/irq.h |    4 ++--
 kernel/irq/manage.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/irq.h +2 -2
index b7cbeed..0c001c1 100644
@@ -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
@@ -426,7 +426,7 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
 /**
  * init_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.
kernel/irq/manage.c +1 -1
index 2734eca..eb47f8b 100644
@@ -851,7 +851,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.
  *