summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDomen Puncer <domen@coderock.org>2005-06-25 14:58:43 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:24:58 -0700
commit29a1d2d1bc5a473eb88489251033b3c5651d2011 (patch)
treef881e99230674967ac6c3aceb08c4310305c95d0
parent96ec3efdcbaea4f403f2a5f1204edbf903a01961 (diff)
[PATCH] init/do_mounts_initrd.c: fix sparse warning
Signed-off-by: Alexey Dobriyan <adobriyan@mail.ru> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--init/do_mounts_initrd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 07e7d31f2d0b..4def882d0b31 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -41,7 +41,7 @@ static int __init do_linuxrc(void * shell)
static void __init handle_initrd(void)
{
int error;
- int i, pid;
+ int pid;
real_root_dev = new_encode_dev(ROOT_DEV);
create_dev("/dev/root.old", Root_RAM0, NULL);
@@ -58,7 +58,7 @@ static void __init handle_initrd(void)
pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
if (pid > 0) {
- while (pid != sys_wait4(-1, &i, 0, NULL))
+ while (pid != sys_wait4(-1, NULL, 0, NULL))
yield();
}