git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cpuset: fix wrong calculation of relax domain level
[safe/jmp/linux-2.6]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index
8eeeccb
..
644fc01
100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-14,16
+14,6
@@
static void __init error(char *x)
message = x;
}
message = x;
}
-static void __init *malloc(size_t size)
-{
- return kmalloc(size, GFP_KERNEL);
-}
-
-static void __init free(void *where)
-{
- kfree(where);
-}
-
/* link hash */
#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
/* link hash */
#define N_ALIGN(len) ((((len) + 1) & ~3) + 2)
@@
-407,18
+397,10
@@
static long bytes_out;
static void __init flush_window(void);
static void __init error(char *m);
static void __init flush_window(void);
static void __init error(char *m);
-static void __init gzip_mark(void **);
-static void __init gzip_release(void **);
-#
include "../lib/inflate.c"
+#
define NO_INFLATE_MALLOC
-static void __init gzip_mark(void **ptr)
-{
-}
-
-static void __init gzip_release(void **ptr)
-{
-}
+#include "../lib/inflate.c"
/* ===========================================================================
* Write the output window window[0..outcnt-1] and update crc and bytes_out.
/* ===========================================================================
* Write the output window window[0..outcnt-1] and update crc and bytes_out.