Commit 5a930dd9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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'
parent e46bdb8d
...@@ -306,7 +306,7 @@ static int crd_infd, crd_outfd; ...@@ -306,7 +306,7 @@ static int crd_infd, crd_outfd;
static int fill_inbuf(void); static int fill_inbuf(void);
static void flush_window(void); static void flush_window(void);
static void *malloc(int size); static void *malloc(size_t size);
static void free(void *where); static void free(void *where);
static void error(char *m); static void error(char *m);
static void gzip_mark(void **); static void gzip_mark(void **);
...@@ -314,7 +314,7 @@ static void gzip_release(void **); ...@@ -314,7 +314,7 @@ static void gzip_release(void **);
#include "../lib/inflate.c" #include "../lib/inflate.c"
static void __init *malloc(int size) static void __init *malloc(size_t size)
{ {
return kmalloc(size, GFP_KERNEL); return kmalloc(size, GFP_KERNEL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment