diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-21 13:06:32 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-21 13:06:37 +0400 |
| commit | 2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7 (patch) | |
| tree | bbad5e4c8e3baddb514c294523532671f3e1cf57 /kernel/irq/manage.c | |
| parent | 9ec84acee1e221d99dc33237bff5e82839d10cc0 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
| download | linux-2d2b7749e8f9d32c16c599f85f2b1a51b76dddb7.tar.xz | |
Merge commit 'v3.2-rc6' into core/locking
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 0e2b179bc7b3..1da999f5e746 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -623,8 +623,9 @@ static irqreturn_t irq_nested_primary_handler(int irq, void *dev_id) static int irq_wait_for_interrupt(struct irqaction *action) { + set_current_state(TASK_INTERRUPTIBLE); + while (!kthread_should_stop()) { - set_current_state(TASK_INTERRUPTIBLE); if (test_and_clear_bit(IRQTF_RUNTHREAD, &action->thread_flags)) { @@ -632,7 +633,9 @@ static int irq_wait_for_interrupt(struct irqaction *action) return 0; } schedule(); + set_current_state(TASK_INTERRUPTIBLE); } + __set_current_state(TASK_RUNNING); return -1; } |