Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11481
b: refs/heads/master
c: beeca08
h: refs/heads/master
i:
  11479: 1ccb24d
v: v3
  • Loading branch information
Paul Mackerras committed Sep 28, 2005
1 parent fe79295 commit c496915
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20c8c2106305729e7d5e06f6c3d390e965a3dd34
refs/heads/master: beeca08738c4c4024c81a591812bfe38f8c436c0
6 changes: 4 additions & 2 deletions trunk/kernel/irq/handle.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,16 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
/*
* No locking required for CPU-local interrupts:
*/
desc->handler->ack(irq);
if (desc->handler->ack)
desc->handler->ack(irq);
action_ret = handle_IRQ_event(irq, regs, desc->action);
desc->handler->end(irq);
return 1;
}

spin_lock(&desc->lock);
desc->handler->ack(irq);
if (desc->handler->ack)
desc->handler->ack(irq);
/*
* REPLAY is when Linux resends an IRQ that was dropped earlier
* WAITING is used by probe to mark irqs that are being tested
Expand Down

0 comments on commit c496915

Please sign in to comment.