Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 43a723286f3cae795418c62bc41c3cce73791a81

Authored by Linus Torvalds
2 parents 15ccb7b429 a9fe8d5fd5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 2 changed files Side-by-side Diff

arch/m32r/kernel/irq.c
Diff comments   View file @ 43a7232
... ... @@ -80,7 +80,7 @@
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  
... ... @@ -74,7 +74,8 @@
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)