please pull powerpc-merge.git

[Paul Mackerras]

Linus,

Please pull

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git

There are 3 commits in there: a defconfig update and two other fixes
that need to go in 2.6.15.  I have included the patch for the two
fixes (but not the boring defconfig update :).

Thanks,
Paul.

 arch/powerpc/configs/cell_defconfig          |    7 ++++---
 arch/powerpc/configs/g5_defconfig            |    9 +++++----
 arch/powerpc/configs/iseries_defconfig       |    7 ++++---
 arch/powerpc/configs/maple_defconfig         |   10 +++++-----
 arch/powerpc/configs/ppc64_defconfig         |    7 ++++---
 arch/powerpc/configs/pseries_defconfig       |    7 ++++---
 arch/powerpc/kernel/entry_64.S               |    4 ++--
 arch/ppc/platforms/85xx/mpc85xx_cds_common.c |    3 ++-
 8 files changed, 30 insertions(+), 24 deletions(-)

Edson Seabra:
      powerpc: CPM2 interrupt handler failure after 100,000 interrupts

Paul Mackerras:
      powerpc: correct register usage in 64-bit syscall exit path
      powerpc: update defconfigs

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2d22bf0..bce33a3 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -183,8 +183,8 @@ syscall_exit_trace_cont:
 	ld	r13,GPR13(r1)		/* returning to usermode */
 1:	ld	r2,GPR2(r1)
 	li	r12,MSR_RI
-	andc	r10,r10,r12
-	mtmsrd	r10,1			/* clear MSR.RI */
+	andc	r11,r10,r12
+	mtmsrd	r11,1			/* clear MSR.RI */
 	ld	r1,GPR1(r1)
 	mtlr	r4
 	mtcr	r5
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index d8991b8..5e8cc5e 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file
 }
 
 #ifdef CONFIG_CPM2
-static void cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)
 {
 	while((irq = cpm2_get_irq(regs)) >= 0)
 		__do_IRQ(irq, regs);
+	return IRQ_HANDLED;
 }
 
 static struct irqaction cpm2_irqaction = {