The patch titled
fix tty_ioctl powerpc build
has been added to the -mm tree. Its filename is
tty-switch-to-ktermios-powerpc-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix tty_ioctl powerpc build
From: Hugh Dickins <hugh@xxxxxxxxxxx>
Fix tty_ioctl.c compilation errors and warnings on PowerPC, coming from the
tty-switch-to-ktermios patches; and make its ktermios the same as its
termios (as the comment says).
Signed-off-by: Hugh Dickins <hugh@xxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/tty_ioctl.c | 4 ++--
include/asm-generic/termios.h | 4 ++--
include/asm-powerpc/termbits.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/char/tty_ioctl.c~tty-switch-to-ktermios-powerpc-fix drivers/char/tty_ioctl.c
--- a/drivers/char/tty_ioctl.c~tty-switch-to-ktermios-powerpc-fix
+++ a/drivers/char/tty_ioctl.c
@@ -495,8 +495,8 @@ static int get_sgttyb(struct tty_struct
struct sgttyb tmp;
mutex_lock(&tty->termios_mutex);
- tmp.sg_ispeed = tty->c_ispeed;
- tmp.sg_ospeed = tty->c_ospeed;
+ tmp.sg_ispeed = tty->termios->c_ispeed;
+ tmp.sg_ospeed = tty->termios->c_ospeed;
tmp.sg_erase = tty->termios->c_cc[VERASE];
tmp.sg_kill = tty->termios->c_cc[VKILL];
tmp.sg_flags = get_sgflags(tty);
diff -puN include/asm-generic/termios.h~tty-switch-to-ktermios-powerpc-fix include/asm-generic/termios.h
--- a/include/asm-generic/termios.h~tty-switch-to-ktermios-powerpc-fix
+++ a/include/asm-generic/termios.h
@@ -11,7 +11,7 @@
/*
* Translate a "termio" structure into a "termios". Ugh.
*/
-static inline int user_termio_to_kernel_termios(struct termios *termios,
+static inline int user_termio_to_kernel_termios(struct ktermios *termios,
struct termio __user *termio)
{
unsigned short tmp;
@@ -48,7 +48,7 @@ static inline int user_termio_to_kernel_
* Translate a "termios" structure into a "termio". Ugh.
*/
static inline int kernel_termios_to_user_termio(struct termio __user *termio,
- struct termios *termios)
+ struct ktermios *termios)
{
if (put_user(termios->c_iflag, &termio->c_iflag) < 0 ||
put_user(termios->c_oflag, &termio->c_oflag) < 0 ||
diff -puN include/asm-powerpc/termbits.h~tty-switch-to-ktermios-powerpc-fix include/asm-powerpc/termbits.h
--- a/include/asm-powerpc/termbits.h~tty-switch-to-ktermios-powerpc-fix
+++ a/include/asm-powerpc/termbits.h
@@ -37,8 +37,8 @@ struct ktermios {
tcflag_t c_oflag; /* output mode flags */
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
+ cc_t c_line; /* line discipline (== c_cc[19]) */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};
_
Patches currently in -mm which might be from hugh@xxxxxxxxxxx are
origin.patch
mm-more-comment-lockorder.patch
__unmap_hugepage_range-add-comment.patch
honour-mnt_noexec-for-access.patch
generic-bug-implementation.patch
generic-bug-for-i386.patch
generic-bug-for-x86-64.patch
bug-test-1.patch
tty-switch-to-ktermios-powerpc-fix.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
