diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /arch/powerpc | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/boot/addRamDisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/addRamDisk.c b/arch/powerpc/boot/addRamDisk.c index c02a99952be7..893f446cbd22 100644 --- a/arch/powerpc/boot/addRamDisk.c +++ b/arch/powerpc/boot/addRamDisk.c | |||
| @@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r) | |||
| 58 | 58 | ||
| 59 | return 64; | 59 | return 64; |
| 60 | } | 60 | } |
| 61 | void get4k(FILE *file, char *buf ) | 61 | static void get4k(FILE *file, char *buf ) |
| 62 | { | 62 | { |
| 63 | unsigned j; | 63 | unsigned j; |
| 64 | unsigned num = fread(buf, 1, 4096, file); | 64 | unsigned num = fread(buf, 1, 4096, file); |
| @@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf ) | |||
| 66 | buf[j] = 0; | 66 | buf[j] = 0; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | void put4k(FILE *file, char *buf ) | 69 | static void put4k(FILE *file, char *buf ) |
| 70 | { | 70 | { |
| 71 | fwrite(buf, 1, 4096, file); | 71 | fwrite(buf, 1, 4096, file); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | void death(const char *msg, FILE *fdesc, const char *fname) | 74 | static void death(const char *msg, FILE *fdesc, const char *fname) |
| 75 | { | 75 | { |
| 76 | fprintf(stderr, msg); | 76 | fprintf(stderr, msg); |
| 77 | fclose(fdesc); | 77 | fclose(fdesc); |