The patch titled
uml: add back accidentally removed error
has been added to the -mm tree. Its filename is
uml-add-back-accidentally-removed-error.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: add back accidentally removed error
From: Jeff Dike <jdike@xxxxxxxxxxx>
In the 2.6.20 hang patch, I accidentally threw out an error message.
This puts it back.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/os-Linux/sigio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN arch/um/os-Linux/sigio.c~uml-add-back-accidentally-removed-error arch/um/os-Linux/sigio.c
--- a/arch/um/os-Linux/sigio.c~uml-add-back-accidentally-removed-error
+++ a/arch/um/os-Linux/sigio.c
@@ -334,8 +334,11 @@ void maybe_sigio_broken(int fd, int read
sigio_lock();
err = need_poll(&all_sigio_fds, all_sigio_fds.used + 1);
- if(err)
+ if(err){
+ printk("maybe_sigio_broken - failed to add pollfd for "
+ "descriptor %d\n", fd);
goto out;
+ }
all_sigio_fds.poll[all_sigio_fds.used++] =
((struct pollfd) { .fd = fd,
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
uml-fix-host-ldt-lookup-initialization-locking-try-2.patch
uml-add-back-accidentally-removed-error.patch
uml-enable-raw.patch
uml-host-vdso-fix.patch
uml-pte_mkread-fix.patch
uml-delete-unused-code.patch
uml-formatting-fixes.patch
uml-host_info-tidying.patch
uml-fix-prototypes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
