2006-01-03 23:46:42

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 2/12] 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 <[email protected]>

Index: linux-2.6.15/arch/um/drivers/ubd_kern.c
===================================================================
--- linux-2.6.15.orig/arch/um/drivers/ubd_kern.c 2005-12-20 00:24:55.000000000 -0500
+++ linux-2.6.15/arch/um/drivers/ubd_kern.c 2005-12-20 00:34:45.000000000 -0500
@@ -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;
+}
Index: linux-2.6.15/arch/um/kernel/sigio_user.c
===================================================================
--- linux-2.6.15.orig/arch/um/kernel/sigio_user.c 2005-12-20 00:24:54.000000000 -0500
+++ linux-2.6.15/arch/um/kernel/sigio_user.c 2005-12-20 00:33:38.000000000 -0500
@@ -216,6 +216,8 @@ static int write_sigio_thread(void *unus
"err = %d\n", -n);
}
}
+
+ return 0;
}

static int need_poll(int n)
Index: linux-2.6.15/arch/um/os-Linux/aio.c
===================================================================
--- linux-2.6.15.orig/arch/um/os-Linux/aio.c 2005-12-19 21:34:12.000000000 -0500
+++ linux-2.6.15/arch/um/os-Linux/aio.c 2005-12-20 00:34:25.000000000 -0500
@@ -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;