UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Stephen Rothwell 2009-08-10 17:14:55 +00:00 committed by Benjamin Herrenschmidt
parent 903444e429
commit 3c15a68880
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/boot/mktree.c
View File

@ -36,7 +36,7 @@ typedef struct boot_block {
} boot_block_t; } boot_block_t;
#define IMGBLK 512 #define IMGBLK 512
char tmpbuf[IMGBLK]; unsigned int tmpbuf[IMGBLK / sizeof(unsigned int)];
int main(int argc, char *argv[]) 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. /* 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", fprintf(stderr, "%s is too small to be an ELF image\n",
argv[1]); argv[1]);
exit(4); exit(4);
} }
if ((*(unsigned int *)tmpbuf) != htonl(0x7f454c46)) { if (tmpbuf[0] != htonl(0x7f454c46)) {
fprintf(stderr, "%s is not an ELF image\n", argv[1]); fprintf(stderr, "%s is not an ELF image\n", argv[1]);
exit(4); exit(4);
} }
@ -121,11 +121,11 @@ int main(int argc, char *argv[])
} }
while (nblks-- > 0) { while (nblks-- > 0) {
if (read(in_fd, tmpbuf, IMGBLK) < 0) { if (read(in_fd, tmpbuf, sizeof(tmpbuf)) < 0) {
perror("zImage read"); perror("zImage read");
exit(5); exit(5);
} }
cp = (unsigned int *)tmpbuf; cp = tmpbuf;
for (i = 0; i < sizeof(tmpbuf) / sizeof(unsigned int); i++) for (i = 0; i < sizeof(tmpbuf) / sizeof(unsigned int); i++)
cksum += *cp++; cksum += *cp++;
if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) { if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {