From bdb620ccae6665a60e466f73473c52c3cc294767 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Jun 2009 12:42:49 +0100 Subject: [PATCH] --- yaml --- r: 146255 b: refs/heads/master c: 5b0ed5263cb089500052f8c1ab6e0706bebf0d83 h: refs/heads/master i: 146253: 3d2d45afbf89e36431bf3bb94d01e533e2336955 146251: 6f613739a808df0b958be31f99208556d2bdd54e 146247: eb1c962a96ffa1749f1268a83cdcc62028dc55ab 146239: 9a6ab2652f54fba7d10a755272da32075f7190ca v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/termios.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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); }