Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2453d6ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes-for-linus' of... 

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
parents 12e24f34 ab33dcff

include/linux/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -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.

kernel/irq/manage.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

 *