aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/sigio.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-02-28 23:13:11 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 17:53:38 -0500
commit04a51e66adcdc0de6ffaa488934ce3ffb3818ecf (patch)
tree42a3ae0606087ac3e01e37e4b2e56a65bdb5e542 /arch/um/os-Linux/sigio.c
parentaf727902212343211627da14d17c85592feb0e18 (diff)
[PATCH] uml: add back accidentally removed error
In the 2.6.20 hang patch, I accidentally threw out an error message. This puts it back. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/sigio.c')
-rw-r--r--arch/um/os-Linux/sigio.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index b2e1fd8e3571..3fc43b33db66 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -334,8 +334,11 @@ void maybe_sigio_broken(int fd, int read)
334 334
335 sigio_lock(); 335 sigio_lock();
336 err = need_poll(&all_sigio_fds, all_sigio_fds.used + 1); 336 err = need_poll(&all_sigio_fds, all_sigio_fds.used + 1);
337 if(err) 337 if(err){
338 printk("maybe_sigio_broken - failed to add pollfd for "
339 "descriptor %d\n", fd);
338 goto out; 340 goto out;
341 }
339 342
340 all_sigio_fds.poll[all_sigio_fds.used++] = 343 all_sigio_fds.poll[all_sigio_fds.used++] =
341 ((struct pollfd) { .fd = fd, 344 ((struct pollfd) { .fd = fd,