diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 18:34:58 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 18:34:58 +0100 |
commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /arch/sparc/boot/piggyback_32.c | |
parent | Revert "knfsd: avoid overloading the CPU scheduler with enormous load averages" (diff) | |
parent | Linux 2.6.32-rc8 (diff) | |
download | linux-9b8b317d58084b9a44f6f33b355c4278d9f841fb.tar.xz linux-9b8b317d58084b9a44f6f33b355c4278d9f841fb.zip |
Merge commit 'v2.6.32-rc8' into HEAD
Diffstat (limited to 'arch/sparc/boot/piggyback_32.c')
-rw-r--r-- | arch/sparc/boot/piggyback_32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/boot/piggyback_32.c b/arch/sparc/boot/piggyback_32.c index e8dc9adfcd61..ac944aec7301 100644 --- a/arch/sparc/boot/piggyback_32.c +++ b/arch/sparc/boot/piggyback_32.c @@ -35,17 +35,17 @@ * as PROM looks for a.out image only. */ -unsigned short ld2(char *p) +static unsigned short ld2(char *p) { return (p[0] << 8) | p[1]; } -unsigned int ld4(char *p) +static unsigned int ld4(char *p) { return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; } -void st4(char *p, unsigned int x) +static void st4(char *p, unsigned int x) { p[0] = x >> 24; p[1] = x >> 16; @@ -53,7 +53,7 @@ void st4(char *p, unsigned int x) p[3] = x; } -void usage(void) +static void usage(void) { /* fs_img.gz is an image of initial ramdisk. */ fprintf(stderr, "Usage: piggyback vmlinux.aout System.map fs_img.gz\n"); @@ -61,7 +61,7 @@ void usage(void) exit(1); } -void die(char *str) +static void die(char *str) { perror (str); exit(1); |