diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-23 16:10:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-23 16:10:32 -0700 |
| commit | 1aad7fb88d76b618460fbfd584d12193ed4ae3a0 (patch) | |
| tree | 8d6bca982ff6678560fc62d7a0155c092129fc77 | |
| parent | 282a571a35cf6b31b45eb715726907956eb2ce89 (diff) | |
| download | patches-1aad7fb88d76b618460fbfd584d12193ed4ae3a0.tar.gz | |
tty bugfix
| -rw-r--r-- | tty/tty-icount-changeover-for-other-main-devices.patch | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/tty/tty-icount-changeover-for-other-main-devices.patch b/tty/tty-icount-changeover-for-other-main-devices.patch index 1b49fe122f80b7..4174552a265992 100644 --- a/tty/tty-icount-changeover-for-other-main-devices.patch +++ b/tty/tty-icount-changeover-for-other-main-devices.patch @@ -8,6 +8,8 @@ Message-ID: <20100916172147.25987.72021.stgit@localhost.localdomain> Again basically cut and paste +Convert the main driver set to use the hooks for GICOUNT + Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> @@ -16,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> arch/ia64/hp/sim/simserial.c | 12 ------ drivers/char/amiserial.c | 56 ++++++++++++++++------------- drivers/char/cyclades.c | 49 +++++++++++++------------ - drivers/char/ip2/ip2main.c | 71 ++++++++++++++++++++++-------------- + drivers/char/ip2/ip2main.c | 72 ++++++++++++++++++++++--------------- drivers/char/mxser.c | 62 ++++++++++++++++++-------------- drivers/char/nozomi.c | 35 ++++++++---------- drivers/char/pcmcia/synclink_cs.c | 60 ++++++++++++++----------------- @@ -25,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/char/synclinkmp.c | 61 ++++++++++++++----------------- drivers/serial/68360serial.c | 51 +++++++++++++------------- net/bluetooth/rfcomm/tty.c | 4 -- - 12 files changed, 296 insertions(+), 293 deletions(-) + 12 files changed, 296 insertions(+), 294 deletions(-) --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c @@ -212,7 +214,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int ip2_tiocmget(struct tty_struct *tty, struct file *file); static int ip2_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear); -+static int get_icount(struct tty_struct *tty, ++static int ip2_get_icount(struct tty_struct *tty, + struct serial_icounter_struct *icount); static void set_irq(int, int); @@ -225,7 +227,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .proc_fops = &ip2_proc_fops, }; -@@ -2297,34 +2300,6 @@ ip2_ioctl ( PTTY tty, struct file *pFile +@@ -2128,7 +2131,6 @@ ip2_ioctl ( PTTY tty, struct file *pFile + i2ChanStrPtr pCh = DevTable[tty->index]; + i2eBordStrPtr pB; + struct async_icount cprev, cnow; /* kernel counter temps */ +- struct serial_icounter_struct __user *p_cuser; + int rc = 0; + unsigned long flags; + void __user *argp = (void __user *)arg; +@@ -2297,34 +2299,6 @@ ip2_ioctl ( PTTY tty, struct file *pFile break; /* @@ -260,11 +270,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * The rest are not supported by this driver. By returning -ENOIOCTLCMD they * will be passed to the line discipline for it to handle. */ -@@ -2348,6 +2323,46 @@ ip2_ioctl ( PTTY tty, struct file *pFile +@@ -2348,6 +2322,46 @@ ip2_ioctl ( PTTY tty, struct file *pFile return rc; } -+static int get_icount(struct tty_struct *tty, ++static int ip2_get_icount(struct tty_struct *tty, + struct serial_icounter_struct *icount) +{ + i2ChanStrPtr pCh = DevTable[tty->index]; |