powerpc: Merge xmon

The merged version follows the ppc64 version pretty closely mostly,
and in fact ARCH=ppc64 now uses the arch/powerpc/xmon version.
The main difference for ppc64 is that the 'p' command to call
show_state (which was always pretty dodgy) has been replaced by
the ppc32 'p' command, which calls a given procedure (so in fact
the old 'p' command behaviour can be achieved with 'p $show_state').

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 2a7af765bfb..743f0dbdebf 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -89,7 +89,7 @@ core-y				+= arch/powerpc/mm/
 core-y                          += arch/powerpc/sysdev/
 core-y                          += arch/powerpc/platforms/
 core-y                          += arch/powerpc/lib/
-core-$(CONFIG_XMON)             += arch/ppc64/xmon/
+core-$(CONFIG_XMON)             += arch/powerpc/xmon/
 drivers-$(CONFIG_OPROFILE)      += arch/powerpc/oprofile/
 
 boot := arch/ppc64/boot