Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
  powerpc/44x: Support 16K/64K base page sizes on 44x
  powerpc: Force memory size to be a multiple of PAGE_SIZE
  powerpc/32: Wire up the trampoline code for kdump
  powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
  powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
  powerpc/32: Setup OF properties for kdump
  powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
  powerpc: Prepare xmon_save_regs for use with kdump
  powerpc: Remove default kexec/crash_kernel ops assignments
  powerpc: Make default kexec/crash_kernel ops implicit
  powerpc: Setup OF properties for ppc32 kexec
  powerpc/pseries: Fix cpu hotplug
  powerpc: Fix KVM build on ppc440
  powerpc/cell: add QPACE as a separate Cell platform
  powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
  powerpc/mpc5200: fix error paths in PSC UART probe function
  powerpc/mpc5200: add rts/cts handling in PSC UART driver
  powerpc/mpc5200: Make PSC UART driver update serial errors counters
  powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
  powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
  ...

Fix trivial conflict in drivers/char/Makefile as per Paul's directions

3 files changed, 3 insertions, 78 deletions

diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile
index 51d97588e762..9cb03b71b9d6 100644
--- a/arch/powerpc/xmon/Makefile
+++ b/arch/powerpc/xmon/Makefile
@@ -4,7 +4,7 @@ ifdef CONFIG_PPC64
 EXTRA_CFLAGS += -mno-minimal-toc
 endif
 
-obj-y                   += xmon.o setjmp.o start.o nonstdio.o
+obj-y                   += xmon.o start.o nonstdio.o
 
 ifdef CONFIG_XMON_DISASSEMBLY
 obj-y                   += ppc-dis.o ppc-opc.o
diff --git a/arch/powerpc/xmon/setjmp.S b/arch/powerpc/xmon/setjmp.S
deleted file mode 100644
index 04c0b305ad4a..000000000000
--- a/arch/powerpc/xmon/setjmp.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 1996 Paul Mackerras.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * NOTE: assert(sizeof(buf) > 23 * sizeof(long))
- */
-#include <asm/processor.h>
-#include <asm/ppc_asm.h>
-#include <asm/asm-offsets.h>
-
-/*
- * Grab the register values as they are now.
- * This won't do a particularily good job because we really
- * want our caller's caller's registers, and our caller has
- * already executed its prologue.
- * ToDo: We could reach back into the caller's save area to do
- * a better job of representing the caller's state (note that
- * that will be different for 32-bit and 64-bit, because of the
- * different ABIs, though).
- */
-_GLOBAL(xmon_save_regs)
-        PPC_STL r0,0*SZL(r3)
-        PPC_STL r2,2*SZL(r3)
-        PPC_STL r3,3*SZL(r3)
-        PPC_STL r4,4*SZL(r3)
-        PPC_STL r5,5*SZL(r3)
-        PPC_STL r6,6*SZL(r3)
-        PPC_STL r7,7*SZL(r3)
-        PPC_STL r8,8*SZL(r3)
-        PPC_STL r9,9*SZL(r3)
-        PPC_STL r10,10*SZL(r3)
-        PPC_STL r11,11*SZL(r3)
-        PPC_STL r12,12*SZL(r3)
-        PPC_STL r13,13*SZL(r3)
-        PPC_STL r14,14*SZL(r3)
-        PPC_STL r15,15*SZL(r3)
-        PPC_STL r16,16*SZL(r3)
-        PPC_STL r17,17*SZL(r3)
-        PPC_STL r18,18*SZL(r3)
-        PPC_STL r19,19*SZL(r3)
-        PPC_STL r20,20*SZL(r3)
-        PPC_STL r21,21*SZL(r3)
-        PPC_STL r22,22*SZL(r3)
-        PPC_STL r23,23*SZL(r3)
-        PPC_STL r24,24*SZL(r3)
-        PPC_STL r25,25*SZL(r3)
-        PPC_STL r26,26*SZL(r3)
-        PPC_STL r27,27*SZL(r3)
-        PPC_STL r28,28*SZL(r3)
-        PPC_STL r29,29*SZL(r3)
-        PPC_STL r30,30*SZL(r3)
-        PPC_STL r31,31*SZL(r3)
-        /* go up one stack frame for SP */
-        PPC_LL  r4,0(r1)
-        PPC_STL r4,1*SZL(r3)
-        /* get caller's LR */
-        PPC_LL  r0,LRSAVE(r4)
-        PPC_STL r0,_NIP-STACK_FRAME_OVERHEAD(r3)
-        PPC_STL r0,_LINK-STACK_FRAME_OVERHEAD(r3)
-        mfmsr   r0
-        PPC_STL r0,_MSR-STACK_FRAME_OVERHEAD(r3)
-        mfctr   r0
-        PPC_STL r0,_CTR-STACK_FRAME_OVERHEAD(r3)
-        mfxer   r0
-        PPC_STL r0,_XER-STACK_FRAME_OVERHEAD(r3)
-        mfcr    r0
-        PPC_STL r0,_CCR-STACK_FRAME_OVERHEAD(r3)
-        li      r0,0
-        PPC_STL r0,_TRAP-STACK_FRAME_OVERHEAD(r3)
-        blr
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 076368c8b8a9..8dfad7d9a004 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -41,6 +41,7 @@
 #include <asm/spu_priv1.h>
 #include <asm/firmware.h>
 #include <asm/setjmp.h>
+#include <asm/reg.h>
 
 #ifdef CONFIG_PPC64
 #include <asm/hvcall.h>
@@ -159,8 +160,6 @@ static int xmon_no_auto_backtrace;
 extern void xmon_enter(void);
 extern void xmon_leave(void);
 
-extern void xmon_save_regs(struct pt_regs *);
-
 #ifdef CONFIG_PPC64
 #define REG             "%.16lx"
 #define REGS_PER_LINE   4
@@ -532,7 +531,7 @@ int xmon(struct pt_regs *excp)
         struct pt_regs regs;
 
         if (excp == NULL) {
-                xmon_save_regs(&regs);
+                ppc_save_regs(&regs);
                 excp = &regs;
         }