diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
| commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
| tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/platforms/hdpu.c | |
| parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) | |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/hdpu.c')
| -rw-r--r-- | arch/ppc/platforms/hdpu.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c index e0f112a1fd0b..d809e17aa536 100644 --- a/arch/ppc/platforms/hdpu.c +++ b/arch/ppc/platforms/hdpu.c | |||
| @@ -659,8 +659,7 @@ static void __init hdpu_map_io(void) | |||
| 659 | char hdpu_smp0[] = "SMP Cpu #0"; | 659 | char hdpu_smp0[] = "SMP Cpu #0"; |
| 660 | char hdpu_smp1[] = "SMP Cpu #1"; | 660 | char hdpu_smp1[] = "SMP Cpu #1"; |
| 661 | 661 | ||
| 662 | static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id, | 662 | static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id) |
| 663 | struct pt_regs *regs) | ||
| 664 | { | 663 | { |
| 665 | volatile unsigned int doorbell; | 664 | volatile unsigned int doorbell; |
| 666 | 665 | ||
| @@ -670,22 +669,21 @@ static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id, | |||
| 670 | mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, doorbell); | 669 | mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, doorbell); |
| 671 | 670 | ||
| 672 | if (doorbell & 1) { | 671 | if (doorbell & 1) { |
| 673 | smp_message_recv(0, regs); | 672 | smp_message_recv(0); |
| 674 | } | 673 | } |
| 675 | if (doorbell & 2) { | 674 | if (doorbell & 2) { |
| 676 | smp_message_recv(1, regs); | 675 | smp_message_recv(1); |
| 677 | } | 676 | } |
| 678 | if (doorbell & 4) { | 677 | if (doorbell & 4) { |
| 679 | smp_message_recv(2, regs); | 678 | smp_message_recv(2); |
| 680 | } | 679 | } |
| 681 | if (doorbell & 8) { | 680 | if (doorbell & 8) { |
| 682 | smp_message_recv(3, regs); | 681 | smp_message_recv(3); |
| 683 | } | 682 | } |
| 684 | return IRQ_HANDLED; | 683 | return IRQ_HANDLED; |
| 685 | } | 684 | } |
| 686 | 685 | ||
| 687 | static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id, | 686 | static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id) |
| 688 | struct pt_regs *regs) | ||
| 689 | { | 687 | { |
| 690 | volatile unsigned int doorbell; | 688 | volatile unsigned int doorbell; |
| 691 | 689 | ||
| @@ -695,16 +693,16 @@ static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id, | |||
| 695 | mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, doorbell); | 693 | mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, doorbell); |
| 696 | 694 | ||
| 697 | if (doorbell & 1) { | 695 | if (doorbell & 1) { |
| 698 | smp_message_recv(0, regs); | 696 | smp_message_recv(0); |
| 699 | } | 697 | } |
| 700 | if (doorbell & 2) { | 698 | if (doorbell & 2) { |
| 701 | smp_message_recv(1, regs); | 699 | smp_message_recv(1); |
| 702 | } | 700 | } |
| 703 | if (doorbell & 4) { | 701 | if (doorbell & 4) { |
| 704 | smp_message_recv(2, regs); | 702 | smp_message_recv(2); |
| 705 | } | 703 | } |
| 706 | if (doorbell & 8) { | 704 | if (doorbell & 8) { |
| 707 | smp_message_recv(3, regs); | 705 | smp_message_recv(3); |
| 708 | } | 706 | } |
| 709 | return IRQ_HANDLED; | 707 | return IRQ_HANDLED; |
| 710 | } | 708 | } |