lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] iSeries: fix xmon.c for combined build

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
2006-11-13 14:50:28 +11:00
committed by Paul Mackerras
parent 501b6d2938
commit 1d13581d00
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
arch/powerpc/xmon/xmon.c
View File

@@ -39,6 +39,7 @@
#include <asm/irq_regs.h> #include <asm/irq_regs.h>
#include <asm/spu.h> #include <asm/spu.h>
#include <asm/spu_priv1.h> #include <asm/spu_priv1.h>
#include <asm/firmware.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/hvcall.h> #include <asm/hvcall.h>
@@ -1567,11 +1568,6 @@ void super_regs(void)
{ {
int cmd; int cmd;
unsigned long val; unsigned long val;
#ifdef CONFIG_PPC_ISERIES
struct paca_struct *ptrPaca = NULL;
struct lppaca *ptrLpPaca = NULL;
struct ItLpRegSave *ptrLpRegSave = NULL;
#endif
cmd = skipbl(); cmd = skipbl();
if (cmd == '\n') { if (cmd == '\n') {
@@ -1588,26 +1584,32 @@ void super_regs(void)
printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3)); printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));
printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR)); printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR));
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
// Dump out relevant Paca data areas. if (firmware_has_feature(FW_FEATURE_ISERIES)) {
printf("Paca: \n"); struct paca_struct *ptrPaca;
ptrPaca = get_paca(); struct lppaca *ptrLpPaca;
struct ItLpRegSave *ptrLpRegSave;
printf(" Local Processor Control Area (LpPaca): \n");
ptrLpPaca = ptrPaca->lppaca_ptr; /* Dump out relevant Paca data areas. */
printf(" Saved Srr0=%.16lx Saved Srr1=%.16lx \n", printf("Paca: \n");
ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1); ptrPaca = get_paca();
printf(" Saved Gpr3=%.16lx Saved Gpr4=%.16lx \n",
ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4); printf(" Local Processor Control Area (LpPaca): \n");
printf(" Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5); ptrLpPaca = ptrPaca->lppaca_ptr;
printf(" Saved Srr0=%.16lx Saved Srr1=%.16lx \n",
printf(" Local Processor Register Save Area (LpRegSave): \n"); ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1);
ptrLpRegSave = ptrPaca->reg_save_ptr; printf(" Saved Gpr3=%.16lx Saved Gpr4=%.16lx \n",
printf(" Saved Sprg0=%.16lx Saved Sprg1=%.16lx \n", ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0); printf(" Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
printf(" Saved Sprg2=%.16lx Saved Sprg3=%.16lx \n",
ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3); printf(" Local Processor Register Save Area (LpRegSave): \n");
printf(" Saved Msr =%.16lx Saved Nia =%.16lx \n", ptrLpRegSave = ptrPaca->reg_save_ptr;
ptrLpRegSave->xMSR, ptrLpRegSave->xNIA); printf(" Saved Sprg0=%.16lx Saved Sprg1=%.16lx \n",
ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
printf(" Saved Sprg2=%.16lx Saved Sprg3=%.16lx \n",
ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
printf(" Saved Msr =%.16lx Saved Nia =%.16lx \n",
ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
}
#endif #endif
return; return;