diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-09 15:44:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-09 15:44:05 -0800 |
| commit | 0b5403cfd5e43f23b79d6a5fc0c1817b9813ed1a (patch) | |
| tree | b35167e6a4d82129fd35baea41a8a15250b3876b /init | |
| parent | a3c454e1fa1c14183980ef2f96d439890df8221b (diff) | |
| parent | bb60cd0766426f857a73deb79fc971c809628caa (diff) | |
| download | history-0b5403cfd5e43f23b79d6a5fc0c1817b9813ed1a.tar.gz | |
Merge bk://are.twiddle.net/axp-2.6
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 2ff568e438c1ed..7608b019137cee 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -16,7 +16,7 @@ static void __init error(char *x) message = x; } -static void __init *malloc(int size) +static void __init *malloc(size_t size) { return kmalloc(size, GFP_KERNEL); } |