summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2004-02-16 00:10:11 +0000
committerjdike <jdike>2004-02-16 00:10:11 +0000
commit597020b156d8517887eee64627e9423bba35168a (patch)
treeb2fa3a6fdcc9699c943af978bab5398a0eccbb2f
parenta7702ea3008ff5338587c8252261dec88ef45d32 (diff)
downloaduml-history-597020b156d8517887eee64627e9423bba35168a.tar.gz
Code tidying.
-rw-r--r--arch/um/drivers/ubd_kern.c2
-rw-r--r--arch/um/kernel/umid.c5
-rw-r--r--arch/um/main.c1
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index b94be36..cbd1996 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -477,7 +477,7 @@ static void ubd_handler(void)
printk("ubd_handler - physmem_subst_mapping failed, "
"err = %d\n", -err);
}
-
+
spin_lock(&io_request_lock);
ubd_finish(req.error);
reactivate_fd(thread_fd, UBD_IRQ);
diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
index ca275bc..56cccb2 100644
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
@@ -205,12 +205,15 @@ static int __init set_uml_dir(char *name, int *add)
printf("Failed to malloc uml_dir - error = %d\n",
errno);
uml_dir = name;
+ /* Return 0 here because do_initcalls doesn't look at
+ * the return value.
+ */
return(0);
}
sprintf(uml_dir, "%s/", name);
}
else uml_dir = name;
- return 0;
+ return(0);
}
static int __init make_uml_dir(void)
diff --git a/arch/um/main.c b/arch/um/main.c
index ead5e2c..2fe4c64 100644
--- a/arch/um/main.c
+++ b/arch/um/main.c
@@ -148,6 +148,7 @@ int main(int argc, char **argv, char **envp)
/* Reboot */
if(ret){
printf("\n");
+
execvp(new_argv[0], new_argv);
perror("Failed to exec kernel");
ret = 1;