tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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:
m32r: Fixup last __do_IRQ leftover
genirq: Add missing status flags to modification mask

Linus Torvalds 43a72328 15ccb7b4

+3 -2
+1 -1
arch/m32r/kernel/irq.c
··· 80 80 #ifdef CONFIG_DEBUG_STACKOVERFLOW 81 81 /* FIXME M32R */ 82 82 #endif 83 - __do_IRQ(irq); 83 + generic_handle_irq(irq); 84 84 irq_exit(); 85 85 set_irq_regs(old_regs); 86 86
+2 -1
include/linux/irq.h
··· 74 74 75 75 #define IRQF_MODIFY_MASK \ 76 76 (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \ 77 - IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL) 77 + IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \ 78 + IRQ_PER_CPU) 78 79 79 80 #ifdef CONFIG_IRQ_PER_CPU 80 81 # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)