Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bb8bd3a52a5dbca8bea31bfc72dacfb384170e69
Commit: bb8bd3a52a5dbca8bea31bfc72dacfb384170e69
Parent: 2605a103cadb29053d6bc7e81c7de802ec75ce6c
Author: Tony Breeds <[EMAIL PROTECTED]>
AuthorDate: Fri Sep 14 17:03:01 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Sep 15 08:18:30 2007 -0700
sparc64 (and others): fix tty_ioctl.c build
Add Guards around TIOCSLCKTRMIOS and TIOCGLCKTRMIOS.
Several architectures are still broken. Put temporary-for-2.6.23 ifdef
guards
around the offending code.
Signed-off-by: Tony Breeds <[EMAIL PROTECTED]>
Cc: Alan Cox <[EMAIL PROTECTED]>
Cc: Paul Mackerras <[EMAIL PROTECTED]>
Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Cc: Heiko Carstens <[EMAIL PROTECTED]>
Cc: "David S. Miller" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by:: Linus Torvalds <[EMAIL PROTECTED]>
---
drivers/char/tty_ioctl.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 4a8969c..3ee73cf 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -795,6 +795,19 @@ int n_tty_ioctl(struct tty_struct * tty, struct file *
file,
if (L_ICANON(tty))
retval = inq_canon(tty);
return put_user(retval, (unsigned int __user *) arg);
+#ifndef TCGETS2
+ case TIOCGLCKTRMIOS:
+ if (kernel_termios_to_user_termios((struct termios
__user *)arg, real_tty->termios_locked))
+ return -EFAULT;
+ return 0;
+
+ case TIOCSLCKTRMIOS:
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+ if
(user_termios_to_kernel_termios(real_tty->termios_locked, (struct termios
__user *) arg))
+ return -EFAULT;
+ return 0;
+#else
case TIOCGLCKTRMIOS:
if (kernel_termios_to_user_termios_1((struct termios
__user *)arg, real_tty->termios_locked))
return -EFAULT;
@@ -806,6 +819,7 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
if
(user_termios_to_kernel_termios_1(real_tty->termios_locked, (struct termios
__user *) arg))
return -EFAULT;
return 0;
+#endif
case TIOCPKT:
{
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
