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

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

[POWERPC] iSeries: Localise and constify some iSeries data 



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

arch/powerpc/platforms/iseries/ipl_parms.h

+0 −2
Original line number Diff line number Diff line
@@ -65,6 +65,4 @@ struct ItIplParmsReal { 
	u64	xRsvd13;		// Reserved			x38-x3F

};



extern struct ItIplParmsReal	xItIplParmsReal;



#endif /* _ISERIES_IPL_PARMS_H */

arch/powerpc/platforms/iseries/lpardata.c

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
/* The HvReleaseData is the root of the information shared between

 * the hypervisor and Linux.

 */

struct HvReleaseData hvReleaseData = {

const struct HvReleaseData hvReleaseData = {

	.xDesc = 0xc8a5d9c4,	/* "HvRD" ebcdic */

	.xSize = sizeof(struct HvReleaseData),

	.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
@@ -186,7 +186,7 @@ struct ItLpNaca itLpNaca = { 
};



/* May be filled in by the hypervisor so cannot end up in the BSS */

struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));

static struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));



/* May be filled in by the hypervisor so cannot end up in the BSS */

struct ItExtVpdPanel xItExtVpdPanel __attribute__((__section__(".data")));
@@ -209,14 +209,14 @@ u64 xMsVpd[3400] __attribute__((__section__(".data"))); 


/* Space for Recovery Log Buffer */

/* May be filled in by the hypervisor so cannot end up in the BSS */

u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));

static u64    xRecoveryLogBuffer[32] __attribute__((__section__(".data")));



struct SpCommArea xSpCommArea = {

static const struct SpCommArea xSpCommArea = {

	.xDesc = 0xE2D7C3C2,

	.xFormat = 1,

};



static struct ItLpRegSave iseries_reg_save[] = {

static const struct ItLpRegSave iseries_reg_save[] = {

	[0 ... (NR_CPUS-1)] = {

		.xDesc = 0xd397d9e2,	/* "LpRS" */

		.xSize = sizeof(struct ItLpRegSave),
@@ -229,7 +229,7 @@ static struct ItLpRegSave iseries_reg_save[] = { 
	.reg_save_ptr = &iseries_reg_save[number],			\

}



struct alpaca alpaca[] = {

const struct alpaca alpaca[] = {

	ALPACA_INIT( 0),

#if NR_CPUS > 1

	ALPACA_INIT( 1), ALPACA_INIT( 2), ALPACA_INIT( 3),
@@ -265,7 +265,7 @@ struct alpaca alpaca[] = { 
 * the Naca via the HvReleaseData area.  The HvReleaseData has the

 * offset into the Naca of the pointer to the ItVpdAreas.

 */

struct ItVpdAreas itVpdAreas = {

const struct ItVpdAreas itVpdAreas = {

	.xSlicDesc = 0xc9a3e5c1,		/* "ItVA" */

	.xSlicSize = sizeof(struct ItVpdAreas),

	.xSlicVpdEntries = ItVpdMaxEntries,	/* # VPD array entries */

arch/powerpc/platforms/iseries/naca.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


struct naca_struct {

	/* Kernel only data - undefined for user space */

	void *xItVpdAreas;              /* VPD Data                  0x00 */

	const void *xItVpdAreas;	/* VPD Data                  0x00 */

	void *xRamDisk;                 /* iSeries ramdisk           0x08 */

	u64   xRamDiskSize;		/* In pages                  0x10 */

};

arch/powerpc/platforms/iseries/release_data.h

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ struct HvReleaseData { 
	char	xRsvd3[20];	/* Reserved			x2C-x3F */

};



extern struct HvReleaseData	hvReleaseData;

extern const struct HvReleaseData	hvReleaseData;



#endif /* _ISERIES_RELEASE_DATA_H */

arch/powerpc/platforms/iseries/spcomm_area.h

+0 −2
Original line number Diff line number Diff line
@@ -31,6 +31,4 @@ struct SpCommArea { 
	u8	xRsvd2[80];		// Reserved				030-07F

};



extern struct SpCommArea xSpCommArea;



#endif /* _ISERIES_SPCOMM_AREA_H */