aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-11-29 19:44:09 -0500
committerPaul Mackerras <paulus@samba.org>2006-12-04 04:41:56 -0500
commitbbb681779012fae778c0a53081bbb19cf43bca4e (patch)
treeb69e8c2cb20f68dbca105aaed8ec3d4345f50ba9 /arch/powerpc/xmon
parentec59cf710bcf638a895f2ad90cafb1493b95953e (diff)
[POWERPC] Allow xmon to build on legacy iSeries
xmon still does not run on iSeries, but this allows us to build a combined kernel that includes it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r--arch/powerpc/xmon/xmon.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index dc8a3760a98c..a34ed49e0356 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -44,6 +44,7 @@
44#ifdef CONFIG_PPC64 44#ifdef CONFIG_PPC64
45#include <asm/hvcall.h> 45#include <asm/hvcall.h>
46#include <asm/paca.h> 46#include <asm/paca.h>
47#include <asm/iseries/it_lp_reg_save.h>
47#endif 48#endif
48 49
49#include "nonstdio.h" 50#include "nonstdio.h"
@@ -2580,6 +2581,10 @@ void dump_segments(void)
2580 2581
2581void xmon_init(int enable) 2582void xmon_init(int enable)
2582{ 2583{
2584#ifdef CONFIG_PPC_ISERIES
2585 if (firmware_has_feature(FW_FEATURE_ISERIES))
2586 return;
2587#endif
2583 if (enable) { 2588 if (enable) {
2584 __debugger = xmon; 2589 __debugger = xmon;
2585 __debugger_ipi = xmon_ipi; 2590 __debugger_ipi = xmon_ipi;
@@ -2617,6 +2622,10 @@ static struct sysrq_key_op sysrq_xmon_op =
2617 2622
2618static int __init setup_xmon_sysrq(void) 2623static int __init setup_xmon_sysrq(void)
2619{ 2624{
2625#ifdef CONFIG_PPC_ISERIES
2626 if (firmware_has_feature(FW_FEATURE_ISERIES))
2627 return 0;
2628#endif
2620 register_sysrq_key('x', &sysrq_xmon_op); 2629 register_sysrq_key('x', &sysrq_xmon_op);
2621 return 0; 2630 return 0;
2622} 2631}