Skip to contentSkip to conversation

irq fixes

GIT PULL Ingo Molnar 1 participant 1 message Feb 6, 2011 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

------------------>
Thomas Gleixner (2):
genirq: Add missing status flags to modification mask
m32r: Fixup last __do_IRQ leftover

 arch/m32r/kernel/irq.c |    2 +-
 include/linux/irq.h    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/m32r/kernel/irq.c +1 -1
index f745c12..76eaf38 100644
@@ -80,7 +80,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
 	/* FIXME M32R */
 #endif
-	__do_IRQ(irq);
+	generic_handle_irq(irq);
 	irq_exit();
 	set_irq_regs(old_regs);
 
include/linux/irq.h +2 -1
index abde252..80fcb53 100644
@@ -74,7 +74,8 @@ typedef	void (*irq_flow_handler_t)(unsigned int irq,
 
 #define IRQF_MODIFY_MASK	\
 	(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
-	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL)
+	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
+	 IRQ_PER_CPU)
 
 #ifdef CONFIG_IRQ_PER_CPU
 # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)