diff --git a/[refs] b/[refs] index 5addb84bdd8d..5cb7ffb61d41 100644 --- 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 index f72956331c49..c4ee8056baca 100644 --- 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); }