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

Commit 3c15a688 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt
Browse files

powerpc: use consistent types in mktree 



gcc v4.4 currently produces this build warning:

arch/powerpc/boot/mktree.c: In function 'main':
arch/powerpc/boot/mktree.c:104: warning: dereferencing type-punned pointer will break strict-aliasing rules

tmpbuf is only used as an array of unsigned ints, so declare it that way.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 903444e4

arch/powerpc/boot/mktree.c

+5 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ typedef struct boot_block { 
} boot_block_t;



#define IMGBLK	512

char	tmpbuf[IMGBLK];

unsigned int	tmpbuf[IMGBLK / sizeof(unsigned int)];



int main(int argc, char *argv[])

{
@@ -95,13 +95,13 @@ int main(int argc, char *argv[]) 


	/* Assume zImage is an ELF file, and skip the 64K header.

	*/

	if (read(in_fd, tmpbuf, IMGBLK) != IMGBLK) {

	if (read(in_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {

		fprintf(stderr, "%s is too small to be an ELF image\n",

				argv[1]);

		exit(4);

	}



	if ((*(unsigned int *)tmpbuf) != htonl(0x7f454c46)) {

	if (tmpbuf[0] != htonl(0x7f454c46)) {

		fprintf(stderr, "%s is not an ELF image\n", argv[1]);

		exit(4);

	}
@@ -121,11 +121,11 @@ int main(int argc, char *argv[]) 
	}



	while (nblks-- > 0) {

		if (read(in_fd, tmpbuf, IMGBLK) < 0) {

		if (read(in_fd, tmpbuf, sizeof(tmpbuf)) < 0) {

			perror("zImage read");

			exit(5);

		}

		cp = (unsigned int *)tmpbuf;

		cp = tmpbuf;

		for (i = 0; i < sizeof(tmpbuf) / sizeof(unsigned int); i++)

			cksum += *cp++;

		if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {