aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-10 22:25:31 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:22 +0100
commite1ef824146131709d7466e37f889f2dab24ca98e (patch)
treed66f8423fce8e4d04aa509e1cbbaea2fb99a812c
parent7f94226f03299f1ca32f118f02f2a0295e0e5e93 (diff)
downloadkernel_samsung_smdk4412-e1ef824146131709d7466e37f889f2dab24ca98e.zip
kernel_samsung_smdk4412-e1ef824146131709d7466e37f889f2dab24ca98e.tar.gz
kernel_samsung_smdk4412-e1ef824146131709d7466e37f889f2dab24ca98e.tar.bz2
genirq: Reflect IRQ_MOVE_PCNTXT in irq_data state
Required by x86. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/linux/irq.h8
-rw-r--r--kernel/irq/chip.c4
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 94c8f5b..c101ad4 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -170,6 +170,8 @@ struct irq_data {
* IRQD_LEVEL - Interrupt is level triggered
* IRQD_WAKEUP_STATE - Interrupt is configured for wakeup
* from suspend
+ * IRDQ_MOVE_PCNTXT - Interrupt can be moved in process
+ * context
*/
enum {
IRQD_TRIGGER_MASK = 0xf,
@@ -179,6 +181,7 @@ enum {
IRQD_AFFINITY_SET = (1 << 12),
IRQD_LEVEL = (1 << 13),
IRQD_WAKEUP_STATE = (1 << 14),
+ IRQD_MOVE_PCNTXT = (1 << 15),
};
static inline bool irqd_is_setaffinity_pending(struct irq_data *d)
@@ -225,6 +228,11 @@ static inline bool irqd_is_wakeup_set(struct irq_data *d)
return d->state_use_accessors & IRQD_WAKEUP_STATE;
}
+static inline bool irqd_can_move_in_process_context(struct irq_data *d)
+{
+ return d->state_use_accessors & IRQD_MOVE_PCNTXT;
+}
+
/**
* struct irq_chip - hardware interrupt chip descriptor
*
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 4687457..2b0f919 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -712,11 +712,13 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
irq_settings_clr_and_set(desc, clr, set);
irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
- IRQD_TRIGGER_MASK | IRQD_LEVEL);
+ IRQD_TRIGGER_MASK | IRQD_LEVEL | IRQD_MOVE_PCNTXT);
if (irq_settings_has_no_balance_set(desc))
irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
if (irq_settings_is_per_cpu(desc))
irqd_set(&desc->irq_data, IRQD_PER_CPU);
+ if (irq_settings_can_move_pcntxt(desc))
+ irqd_set(&desc->irq_data, IRQD_MOVE_PCNTXT);
irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));