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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 17 years ago 2453d6ff 12e24f34

+3 -3

2 changed files

expand all

include

linux

irq.h

kernel

irq

manage.c

+2 -2

include/linux/irq.h

··· 157 157 * @irqs_unhandled: stats field for spurious unhandled interrupts 158 158 * @lock: locking for SMP 159 159 * @affinity: IRQ affinity on SMP 160 - * @cpu: cpu index useful for balancing 160 + * @node: node index useful for balancing 161 161 * @pending_mask: pending rebalanced interrupts 162 162 * @threads_active: number of irqaction threads currently running 163 163 * @wait_for_threads: wait queue for sync_irq to wait for threaded handlers ··· 423 423 /** 424 424 * alloc_desc_masks - allocate cpumasks for irq_desc 425 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 427 * @boot: true if need bootmem 428 428 * 429 429 * Allocates affinity and pending_mask cpumask if required.

+1 -1

kernel/irq/manage.c

··· 856 856 * still called in hard interrupt context and has to check 857 857 * whether the interrupt originates from the device. If yes it 858 858 * needs to disable the interrupt on the device and return 859 - * IRQ_THREAD_WAKE which will wake up the handler thread and run 859 + * IRQ_WAKE_THREAD which will wake up the handler thread and run 860 860 * @thread_fn. This split handler design is necessary to support 861 861 * shared interrupts. 862 862 *