Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / tty_ldisc.h

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index d75932e..40f38d8 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -59,6 +59,11 @@
  *     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,
+ *                     unsigned int cmd, unsigned long arg);
+ *
+ *      Process ioctl calls from 32-bit process on 64-bit system
+ *
  * void        (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *     This function notifies the line discpline that a change has
@@ -99,7 +104,7 @@
 #include <linux/fs.h>
 #include <linux/wait.h>
 
-struct tty_ldisc {
+struct tty_ldisc_ops {
        int     magic;
        char    *name;
        int     num;
@@ -118,6 +123,8 @@ struct tty_ldisc {
                         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,
+                               unsigned int cmd, unsigned long arg);
        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
        unsigned int (*poll)(struct tty_struct *, struct file *,
                             struct poll_table_struct *);
@@ -135,6 +142,11 @@ struct tty_ldisc {
        int refcount;
 };
 
+struct tty_ldisc {
+       struct tty_ldisc_ops *ops;
+       int refcount;
+};
+
 #define TTY_LDISC_MAGIC        0x5403
 
 #define LDISC_FLAG_DEFINED     0x00000001