diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-14 05:41:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 05:41:52 -0700 |
| commit | 5a930dd984fb23ea63c4ab18745b082f257d0718 (patch) | |
| tree | d86ea4e413bcc74720ee723904e57ee4071e0170 /init | |
| parent | e46bdb8d9a7c3d3d70ec20a9a1057f29efd03f31 (diff) | |
[PATCH] do_mounts_rd-malloc-fix
gcc-3.4.0 sez:
init/do_mounts_rd.c:309: warning: conflicting types for built-in function 'malloc'
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts_rd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index f7e3d8f1ae70..6f8900ee19b3 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -306,7 +306,7 @@ static int crd_infd, crd_outfd; static int fill_inbuf(void); static void flush_window(void); -static void *malloc(int size); +static void *malloc(size_t size); static void free(void *where); static void error(char *m); static void gzip_mark(void **); @@ -314,7 +314,7 @@ static void gzip_release(void **); #include "../lib/inflate.c" -static void __init *malloc(int size) +static void __init *malloc(size_t size) { return kmalloc(size, GFP_KERNEL); } |
