diff options
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 13 | ||||
| -rw-r--r-- | arch/um/kernel/sigio_user.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/aio.c | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 1fe0dcd9f464..73f9652b2ee9 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -1387,15 +1387,6 @@ int io_thread(void *arg) | |||
| 1387 | printk("io_thread - write failed, fd = %d, err = %d\n", | 1387 | printk("io_thread - write failed, fd = %d, err = %d\n", |
| 1388 | kernel_fd, -n); | 1388 | kernel_fd, -n); |
| 1389 | } | 1389 | } |
| 1390 | } | ||
| 1391 | 1390 | ||
| 1392 | /* | 1391 | return 0; |
| 1393 | * Overrides for Emacs so that we follow Linus's tabbing style. | 1392 | } |
| 1394 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 1395 | * adjust the settings for this buffer only. This must remain at the end | ||
| 1396 | * of the file. | ||
| 1397 | * --------------------------------------------------------------------------- | ||
| 1398 | * Local variables: | ||
| 1399 | * c-file-style: "linux" | ||
| 1400 | * End: | ||
| 1401 | */ | ||
diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c index 48b1f644b9a6..62e5cfdf2188 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) | |||
| 216 | "err = %d\n", -n); | 216 | "err = %d\n", -n); |
| 217 | } | 217 | } |
| 218 | } | 218 | } |
| 219 | |||
| 220 | return 0; | ||
| 219 | } | 221 | } |
| 220 | 222 | ||
| 221 | static int need_poll(int n) | 223 | static int need_poll(int n) |
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c index ffa759addd3c..0b78bb7a994a 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) | |||
| 210 | printk("not_aio_thread - write failed, fd = %d, " | 210 | printk("not_aio_thread - write failed, fd = %d, " |
| 211 | "err = %d\n", aio_req_fd_r, -err); | 211 | "err = %d\n", aio_req_fd_r, -err); |
| 212 | } | 212 | } |
| 213 | |||
| 214 | return 0; | ||
| 213 | } | 215 | } |
| 214 | 216 | ||
| 215 | static int aio_pid = -1; | 217 | static int aio_pid = -1; |
