summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-01-06 00:18:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:45 -0800
commit1b57e9c27882a908f180d4daf72ee12c6f137178 (patch)
tree422930c86e877418cc96623653b750bd0d1f5a9a /arch
parent970d6e3a3461ebc62bc3fc6d4962c936cb2ed97c (diff)
downloadop-kernel-dev-1b57e9c27882a908f180d4daf72ee12c6f137178.zip
op-kernel-dev-1b57e9c27882a908f180d4daf72ee12c6f137178.tar.gz
[PATCH] uml: non-void functions should return something
There are a few functions which are declared to return something, but don't. These are actually infinite loops which are forced to be declared as non-void. This makes them all return 0. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/drivers/ubd_kern.c13
-rw-r--r--arch/um/kernel/sigio_user.c2
-rw-r--r--arch/um/os-Linux/aio.c2
3 files changed, 6 insertions, 11 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 1fe0dcd..73f9652 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1387,15 +1387,6 @@ int io_thread(void *arg)
printk("io_thread - write failed, fd = %d, err = %d\n",
kernel_fd, -n);
}
-}
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+ return 0;
+}
diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
index 48b1f64..62e5cfd 100644
--- a/arch/um/kernel/sigio_user.c
+++ b/arch/um/kernel/sigio_user.c
@@ -216,6 +216,8 @@ static int write_sigio_thread(void *unused)
"err = %d\n", -n);
}
}
+
+ return 0;
}
static int need_poll(int n)
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index ffa759a..0b78bb7 100644
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -210,6 +210,8 @@ static int not_aio_thread(void *arg)
printk("not_aio_thread - write failed, fd = %d, "
"err = %d\n", aio_req_fd_r, -err);
}
+
+ return 0;
}
static int aio_pid = -1;
OpenPOWER on IntegriCloud