Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d13581d authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

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



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 501b6d29

arch/powerpc/xmon/xmon.c

+27 −25
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/irq_regs.h>

#include <asm/spu.h>

#include <asm/spu_priv1.h>

#include <asm/firmware.h>



#ifdef CONFIG_PPC64

#include <asm/hvcall.h>
@@ -1567,11 +1568,6 @@ void super_regs(void) 
{

	int cmd;

	unsigned long val;

#ifdef CONFIG_PPC_ISERIES

	struct paca_struct *ptrPaca = NULL;

	struct lppaca *ptrLpPaca = NULL;

	struct ItLpRegSave *ptrLpRegSave = NULL;

#endif



	cmd = skipbl();

	if (cmd == '\n') {
@@ -1588,7 +1584,12 @@ void super_regs(void) 
		printf("sp   = "REG"  sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));

		printf("toc  = "REG"  dar  = "REG"\n", toc, mfspr(SPRN_DAR));

#ifdef CONFIG_PPC_ISERIES

		// Dump out relevant Paca data areas.

		if (firmware_has_feature(FW_FEATURE_ISERIES)) {

			struct paca_struct *ptrPaca;

			struct lppaca *ptrLpPaca;

			struct ItLpRegSave *ptrLpRegSave;



			/* Dump out relevant Paca data areas. */

			printf("Paca: \n");

			ptrPaca = get_paca();
@@ -1608,6 +1609,7 @@ void super_regs(void) 
			       ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);

			printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",

			       ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);

		}

#endif



		return;