Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tty: Fix up PPC fallout from the termios move

This fixes up the problem Stephen Rothwell reported when trying to merge -next

Signed-off-by: Alan Cox <alan@linux.intel.com>
Reported-by: Stephen Rothwell <sfr@cab.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alan Cox and committed by
Greg Kroah-Hartman
9833facf 6a6c8b36

+12 -12
+12 -12
drivers/tty/tty_ioctl.c
··· 738 738 739 739 static void set_sgflags(struct ktermios *termios, int flags) 740 740 { 741 - termios.c_iflag = ICRNL | IXON; 742 - termios.c_oflag = 0; 743 - termios.c_lflag = ISIG | ICANON; 741 + termios->c_iflag = ICRNL | IXON; 742 + termios->c_oflag = 0; 743 + termios->c_lflag = ISIG | ICANON; 744 744 if (flags & 0x02) { /* cbreak */ 745 - termios.c_iflag = 0; 746 - termios.c_lflag &= ~ICANON; 745 + termios->c_iflag = 0; 746 + termios->c_lflag &= ~ICANON; 747 747 } 748 748 if (flags & 0x08) { /* echo */ 749 - termios.c_lflag |= ECHO | ECHOE | ECHOK | 749 + termios->c_lflag |= ECHO | ECHOE | ECHOK | 750 750 ECHOCTL | ECHOKE | IEXTEN; 751 751 } 752 752 if (flags & 0x10) { /* crmod */ 753 - termios.c_oflag |= OPOST | ONLCR; 753 + termios->c_oflag |= OPOST | ONLCR; 754 754 } 755 755 if (flags & 0x20) { /* raw */ 756 - termios.c_iflag = 0; 757 - termios.c_lflag &= ~(ISIG | ICANON); 756 + termios->c_iflag = 0; 757 + termios->c_lflag &= ~(ISIG | ICANON); 758 758 } 759 - if (!(termios.c_lflag & ICANON)) { 760 - termios.c_cc[VMIN] = 1; 761 - termios.c_cc[VTIME] = 0; 759 + if (!(termios->c_lflag & ICANON)) { 760 + termios->c_cc[VMIN] = 1; 761 + termios->c_cc[VTIME] = 0; 762 762 } 763 763 } 764 764