---

yaml --- r: 146255 b: refs/heads/master c: 5b0ed52 h: refs/heads/master i: 146253: 3d2d45a 146251: 6f61373 146247: eb1c962 146239: 9a6ab26 v: v3
git-mirror · Jun 11, 2009 · bdb620c · bdb620c
1 parent 4ea8b33
commit bdb620c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70fd8fdecc4430ffcede7704dd812d4054d1faf9
+refs/heads/master: 5b0ed5263cb089500052f8c1ab6e0706bebf0d83
diff --git a/trunk/arch/x86/include/asm/termios.h b/trunk/arch/x86/include/asm/termios.h
@@ -67,6 +67,7 @@ static inline int user_termio_to_kernel_termios(struct ktermios *termios,
 	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag);
 	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag);
 	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag);
+	get_user(termios->c_line, &termio->c_line);
 	return copy_from_user(termios->c_cc, termio->c_cc, NCC);
 }