The patch titled
tty_io.c: keep davej sane
has been added to the -mm tree. Its filename is
tty_ioc-keep-davej-sane.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: tty_io.c: keep davej sane
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Just comment and next "while" look _very_ wrong. Place { correctly to hint
unsuspecting ones that it's the end of the loop actually.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tty_io.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff -puN drivers/char/tty_io.c~tty_ioc-keep-davej-sane drivers/char/tty_io.c
--- a/drivers/char/tty_io.c~tty_ioc-keep-davej-sane
+++ a/drivers/char/tty_io.c
@@ -362,10 +362,9 @@ int tty_insert_flip_string(struct tty_st
tb->used += space;
copied += space;
chars += space;
- }
- /* There is a small chance that we need to split the data over
- several buffers. If this is the case we must loop */
- while (unlikely(size > copied));
+ /* There is a small chance that we need to split the data over
+ several buffers. If this is the case we must loop */
+ } while (unlikely(size > copied));
return copied;
}
EXPORT_SYMBOL(tty_insert_flip_string);
@@ -386,10 +385,9 @@ int tty_insert_flip_string_flags(struct
copied += space;
chars += space;
flags += space;
- }
- /* There is a small chance that we need to split the data over
- several buffers. If this is the case we must loop */
- while (unlikely(size > copied));
+ /* There is a small chance that we need to split the data over
+ several buffers. If this is the case we must loop */
+ } while (unlikely(size > copied));
return copied;
}
EXPORT_SYMBOL(tty_insert_flip_string_flags);
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
debug_locksh-add-struct-task_struct.patch
net-fix-more-per-cpu-typos.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
task_struct-ifdef-missedem-v-ipc.patch
ifdef-blktrace-debugging-fields.patch
x86_64-fix-more-per-cpu-typos.patch
tty_ioc-keep-davej-sane.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.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
