diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 14:18:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 20:16:11 -0400 |
commit | f5339277eb8d3aed37f12a27988366f68ab68930 (patch) | |
tree | 4b8f14bb6144b128a2d3741aad21bfe24ba15b0d /arch/powerpc/xmon | |
parent | ec86b45af464d2d3c00d1125b220d6c3b6ca93d8 (diff) |
powerpc: Remove FW_FEATURE ISERIES from arch code
This is no longer selectable, so just remove all the dependent code.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 974a47b3c9b8..68a9cbbab450 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/irq_regs.h> | 39 | #include <asm/irq_regs.h> |
40 | #include <asm/spu.h> | 40 | #include <asm/spu.h> |
41 | #include <asm/spu_priv1.h> | 41 | #include <asm/spu_priv1.h> |
42 | #include <asm/firmware.h> | ||
43 | #include <asm/setjmp.h> | 42 | #include <asm/setjmp.h> |
44 | #include <asm/reg.h> | 43 | #include <asm/reg.h> |
45 | 44 | ||
@@ -1635,25 +1634,6 @@ static void super_regs(void) | |||
1635 | mfspr(SPRN_DEC), mfspr(SPRN_SPRG2)); | 1634 | mfspr(SPRN_DEC), mfspr(SPRN_SPRG2)); |
1636 | printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3)); | 1635 | printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3)); |
1637 | printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR)); | 1636 | printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR)); |
1638 | #ifdef CONFIG_PPC_ISERIES | ||
1639 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { | ||
1640 | struct paca_struct *ptrPaca; | ||
1641 | struct lppaca *ptrLpPaca; | ||
1642 | |||
1643 | /* Dump out relevant Paca data areas. */ | ||
1644 | printf("Paca: \n"); | ||
1645 | ptrPaca = local_paca; | ||
1646 | |||
1647 | printf(" Local Processor Control Area (LpPaca): \n"); | ||
1648 | ptrLpPaca = ptrPaca->lppaca_ptr; | ||
1649 | printf(" Saved Srr0=%.16lx Saved Srr1=%.16lx \n", | ||
1650 | ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1); | ||
1651 | printf(" Saved Gpr3=%.16lx Saved Gpr4=%.16lx \n", | ||
1652 | ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4); | ||
1653 | printf(" Saved Gpr5=%.16lx \n", | ||
1654 | ptrLpPaca->gpr5_dword.saved_gpr5); | ||
1655 | } | ||
1656 | #endif | ||
1657 | 1637 | ||
1658 | return; | 1638 | return; |
1659 | } | 1639 | } |
@@ -2856,10 +2836,6 @@ static void dump_tlb_book3e(void) | |||
2856 | 2836 | ||
2857 | static void xmon_init(int enable) | 2837 | static void xmon_init(int enable) |
2858 | { | 2838 | { |
2859 | #ifdef CONFIG_PPC_ISERIES | ||
2860 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
2861 | return; | ||
2862 | #endif | ||
2863 | if (enable) { | 2839 | if (enable) { |
2864 | __debugger = xmon; | 2840 | __debugger = xmon; |
2865 | __debugger_ipi = xmon_ipi; | 2841 | __debugger_ipi = xmon_ipi; |
@@ -2896,10 +2872,6 @@ static struct sysrq_key_op sysrq_xmon_op = { | |||
2896 | 2872 | ||
2897 | static int __init setup_xmon_sysrq(void) | 2873 | static int __init setup_xmon_sysrq(void) |
2898 | { | 2874 | { |
2899 | #ifdef CONFIG_PPC_ISERIES | ||
2900 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
2901 | return 0; | ||
2902 | #endif | ||
2903 | register_sysrq_key('x', &sysrq_xmon_op); | 2875 | register_sysrq_key('x', &sysrq_xmon_op); |
2904 | return 0; | 2876 | return 0; |
2905 | } | 2877 | } |