diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /arch/powerpc/sysdev/mpic.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 3ee03a9a98fa..195215560fd7 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -489,9 +489,9 @@ static inline void mpic_eoi(struct mpic *mpic) | |||
| 489 | } | 489 | } |
| 490 | 490 | ||
| 491 | #ifdef CONFIG_SMP | 491 | #ifdef CONFIG_SMP |
| 492 | static irqreturn_t mpic_ipi_action(int irq, void *dev_id, struct pt_regs *regs) | 492 | static irqreturn_t mpic_ipi_action(int irq, void *dev_id) |
| 493 | { | 493 | { |
| 494 | smp_message_recv(mpic_irq_to_hw(irq) - MPIC_VEC_IPI_0, regs); | 494 | smp_message_recv(mpic_irq_to_hw(irq) - MPIC_VEC_IPI_0); |
| 495 | return IRQ_HANDLED; | 495 | return IRQ_HANDLED; |
| 496 | } | 496 | } |
| 497 | #endif /* CONFIG_SMP */ | 497 | #endif /* CONFIG_SMP */ |