diff options
Diffstat (limited to 'arch/um/kernel/irq.c')
-rw-r--r-- | arch/um/kernel/irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 9870febdbead..cf0dd9cf8c43 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -518,13 +518,13 @@ int init_aio_irq(int irq, char *name, irq_handler_t handler) | |||
518 | 518 | ||
519 | static unsigned long pending_mask; | 519 | static unsigned long pending_mask; |
520 | 520 | ||
521 | unsigned long to_irq_stack(int sig, unsigned long *mask_out) | 521 | unsigned long to_irq_stack(unsigned long *mask_out) |
522 | { | 522 | { |
523 | struct thread_info *ti; | 523 | struct thread_info *ti; |
524 | unsigned long mask, old; | 524 | unsigned long mask, old; |
525 | int nested; | 525 | int nested; |
526 | 526 | ||
527 | mask = xchg(&pending_mask, 1 << sig); | 527 | mask = xchg(&pending_mask, *mask_out); |
528 | if(mask != 0){ | 528 | if(mask != 0){ |
529 | /* If any interrupts come in at this point, we want to | 529 | /* If any interrupts come in at this point, we want to |
530 | * make sure that their bits aren't lost by our | 530 | * make sure that their bits aren't lost by our |
@@ -534,7 +534,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out) | |||
534 | * and pending_mask contains a bit for each interrupt | 534 | * and pending_mask contains a bit for each interrupt |
535 | * that came in. | 535 | * that came in. |
536 | */ | 536 | */ |
537 | old = 1 << sig; | 537 | old = *mask_out; |
538 | do { | 538 | do { |
539 | old |= mask; | 539 | old |= mask; |
540 | mask = xchg(&pending_mask, old); | 540 | mask = xchg(&pending_mask, old); |
@@ -550,6 +550,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out) | |||
550 | 550 | ||
551 | task = cpu_tasks[ti->cpu].task; | 551 | task = cpu_tasks[ti->cpu].task; |
552 | tti = task_thread_info(task); | 552 | tti = task_thread_info(task); |
553 | |||
553 | *ti = *tti; | 554 | *ti = *tti; |
554 | ti->real_thread = tti; | 555 | ti->real_thread = tti; |
555 | task->stack = ti; | 556 | task->stack = ti; |