Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

[sfrench/cifs-2.6.git] / include / linux / tty_ldisc.h

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 840894ca3fc02aeadcf22c4e41b04a3e3b09b36d..b1e6043e9917599be03a955e46ca73123827f6d6 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -54,11 +54,17 @@
  *     low-level driver can "grab" an ioctl request before the line
  *     discpline has a chance to see it.
  *
- * long        (*compat_ioctl)(struct tty_struct * tty, struct file * file,
+ * int (*compat_ioctl)(struct tty_struct * tty, struct file * file,
  *                     unsigned int cmd, unsigned long arg);
  *
  *     Process ioctl calls from 32-bit process on 64-bit system
  *
+ *     NOTE: only ioctls that are neither "pointer to compatible
+ *     structure" nor tty-generic.  Something private that takes
+ *     an integer or a pointer to wordsize-sensitive structure
+ *     belongs here, but most of ldiscs will happily leave
+ *     it NULL.
+ *
  * void        (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *     This function notifies the line discpline that a change has
@@ -184,7 +190,7 @@ struct tty_ldisc_ops {
                         const unsigned char *buf, size_t nr);
        int     (*ioctl)(struct tty_struct *tty, struct file *file,
                         unsigned int cmd, unsigned long arg);
-       long    (*compat_ioctl)(struct tty_struct *tty, struct file *file,
+       int     (*compat_ioctl)(struct tty_struct *tty, struct file *file,
                                unsigned int cmd, unsigned long arg);
        void    (*set_termios)(struct tty_struct *tty, struct ktermios *old);
        __poll_t (*poll)(struct tty_struct *, struct file *,