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

Commit 43a72328 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:
  m32r: Fixup last __do_IRQ leftover
  genirq: Add missing status flags to modification mask
parents 15ccb7b4 a9fe8d5f

arch/m32r/kernel/irq.c

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