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

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

[POWERPC] iseries: remove some gcc 4.1 warnings 



gcc 4.1 produces some warnings that say it is ignoring the packed
attribute on some structure elements, so, since all the elements of
these structs are packed, pack the structs instead.

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

arch/powerpc/platforms/iseries/main_store.h

+63 −63
Original line number Original line Diff line number Diff line
@@ -61,9 +61,9 @@ struct IoHriMainStoreSegment4 { 
};

};





/* Main Store VPD for Power4 */

/* Main Store VPD for Power4 */

struct IoHriMainStoreChipInfo1 {

struct __attribute((packed)) IoHriMainStoreChipInfo1 {

	u32	chipMfgID	__attribute((packed));

	u32	chipMfgID;

	char	chipECLevel[4]	__attribute((packed));

	char	chipECLevel[4];

};

};





struct IoHriMainStoreVpdIdData {

struct IoHriMainStoreVpdIdData {
@@ -73,72 +73,72 @@ struct IoHriMainStoreVpdIdData { 
	char	serialNumber[12];

	char	serialNumber[12];

};

};





struct IoHriMainStoreVpdFruData {

struct	__attribute((packed)) IoHriMainStoreVpdFruData {

	char	fruLabel[8]	__attribute((packed));

	char	fruLabel[8];

	u8	numberOfSlots	__attribute((packed));

	u8	numberOfSlots;

	u8	pluggingType	__attribute((packed));

	u8	pluggingType;

	u16	slotMapIndex	__attribute((packed));

	u16	slotMapIndex;

};

};





struct IoHriMainStoreAdrRangeBlock {

struct  __attribute((packed)) IoHriMainStoreAdrRangeBlock {

	void	*blockStart      __attribute((packed));

	void	*blockStart;

	void	*blockEnd        __attribute((packed));

	void	*blockEnd;

	u32	blockProcChipId __attribute((packed));

	u32	blockProcChipId;

};

};





#define MaxAreaAdrRangeBlocks 4

#define MaxAreaAdrRangeBlocks 4





struct IoHriMainStoreArea4 {

struct __attribute((packed)) IoHriMainStoreArea4 {

	u32	msVpdFormat			__attribute((packed));

	u32	msVpdFormat;

	u8	containedVpdType		__attribute((packed));

	u8	containedVpdType;

	u8	reserved1			__attribute((packed));

	u8	reserved1;

	u16	reserved2			__attribute((packed));

	u16	reserved2;





	u64	msExists			__attribute((packed));

	u64	msExists;

	u64	msFunctional			__attribute((packed));

	u64	msFunctional;





	u32	memorySize			__attribute((packed));

	u32	memorySize;

	u32	procNodeId			__attribute((packed));

	u32	procNodeId;





	u32	numAdrRangeBlocks		__attribute((packed));

	u32	numAdrRangeBlocks;

	struct IoHriMainStoreAdrRangeBlock xAdrRangeBlock[MaxAreaAdrRangeBlocks]	__attribute((packed));

	struct IoHriMainStoreAdrRangeBlock xAdrRangeBlock[MaxAreaAdrRangeBlocks];





	struct IoHriMainStoreChipInfo1	chipInfo0	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo0;

	struct IoHriMainStoreChipInfo1	chipInfo1	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo1;

	struct IoHriMainStoreChipInfo1	chipInfo2	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo2;

	struct IoHriMainStoreChipInfo1	chipInfo3	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo3;

	struct IoHriMainStoreChipInfo1	chipInfo4	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo4;

	struct IoHriMainStoreChipInfo1	chipInfo5	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo5;

	struct IoHriMainStoreChipInfo1	chipInfo6	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo6;

	struct IoHriMainStoreChipInfo1	chipInfo7	__attribute((packed));

	struct IoHriMainStoreChipInfo1	chipInfo7;





	void	*msRamAreaArray			__attribute((packed));

	void	*msRamAreaArray;

	u32	msRamAreaArrayNumEntries	__attribute((packed));

	u32	msRamAreaArrayNumEntries;

	u32	msRamAreaArrayEntrySize		__attribute((packed));

	u32	msRamAreaArrayEntrySize;





	u32	numaDimmExists			__attribute((packed));

	u32	numaDimmExists;

	u32	numaDimmFunctional		__attribute((packed));

	u32	numaDimmFunctional;

	void	*numaDimmArray			__attribute((packed));

	void	*numaDimmArray;

	u32	numaDimmArrayNumEntries		__attribute((packed));

	u32	numaDimmArrayNumEntries;

	u32	numaDimmArrayEntrySize		__attribute((packed));

	u32	numaDimmArrayEntrySize;





	struct IoHriMainStoreVpdIdData idData	__attribute((packed));

	struct IoHriMainStoreVpdIdData idData;





	u64	powerData			__attribute((packed));

	u64	powerData;

	u64	cardAssemblyPartNum		__attribute((packed));

	u64	cardAssemblyPartNum;

	u64	chipSerialNum			__attribute((packed));

	u64	chipSerialNum;





	u64	reserved3			__attribute((packed));

	u64	reserved3;

	char	reserved4[16]			__attribute((packed));

	char	reserved4[16];





	struct IoHriMainStoreVpdFruData fruData	__attribute((packed));

	struct IoHriMainStoreVpdFruData fruData;





	u8	vpdPortNum			__attribute((packed));

	u8	vpdPortNum;

	u8	reserved5			__attribute((packed));

	u8	reserved5;

	u8	frameId				__attribute((packed));

	u8	frameId;

	u8	rackUnit			__attribute((packed));

	u8	rackUnit;

	char	asciiKeywordVpd[256]		__attribute((packed));

	char	asciiKeywordVpd[256];

	u32	reserved6			__attribute((packed));

	u32	reserved6;

};

};