aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-28 15:59:37 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-28 19:41:22 -0400
commit0ef5ca1e1f0de71300142b8f730f26ded6a0c2f3 (patch)
treef8eb0e5e63b7d3115c27f110e59a762fd871d693 /kernel/irq/chip.c
parenta6aeddd1c4e464a2150f97ca2d1c3d68cfbd9296 (diff)
genirq; Fix cleanup fallout
I missed the CONFIG_GENERIC_PENDING_IRQ dependency in the affinity related functions and the IRQ_LEVEL propagation into irq_data state. Did not pop up on my main test platforms. :( Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: David Daney <ddaney@caviumnetworks.com>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 451d1e81c15c..03099d521f5e 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -734,6 +734,8 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
734 irqd_set(&desc->irq_data, IRQD_PER_CPU); 734 irqd_set(&desc->irq_data, IRQD_PER_CPU);
735 if (irq_settings_can_move_pcntxt(desc)) 735 if (irq_settings_can_move_pcntxt(desc))
736 irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT); 736 irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
737 if (irq_settings_is_level(desc))
738 irqd_set(&desc->irq_data, IRQD_LEVEL);
737 739
738 irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc)); 740 irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));
739 741