2009-11-13 15:09:15

by Martin Schwidefsky

Subject: [patch 00/52] s390 patches for the next merge window (2.6.33)

Greetings,
the current patch queue on git390 for the next merge window.
52 patches, over half of them (27) are for the common-io-layer
rework. 6 patches for the optimization of the fault handler,
another 6 for the new cex3 crypto cards and some other stuff.
As always, have fun ..

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.

2009-11-13 15:28:25

by Arnd Bergmann

Subject: Re: [patch 00/52] s390 patches for the next merge window (2.6.33)

I have one pending for the tty3270 driver, will resend.

Arnd <><

2009-11-13 15:31:19

by Arnd Bergmann

Subject: s390: move keyboard compat ioctls into tty3270 driver

All keyboard ioctls are compatible, so we can simply
move the compat handling into the vt and tty3270 drivers.

Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 3838567..86b2889 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -1731,6 +1731,22 @@ tty3270_ioctl(struct tty_struct *tty, struct file *file,
return kbd_ioctl(tp->kbd, file, cmd, arg);
}

+#ifdef CONFIG_COMPAT
+static long
+tty3270_compat_ioctl(struct tty_struct *tty, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
+ struct tty3270 *tp;
+
+ tp = tty->driver_data;
+ if (!tp)
+ return -ENODEV;
+ if (tty->flags & (1 << TTY_IO_ERROR))
+ return -EIO;
+ return kbd_ioctl(tp->kbd, file, cmd, (unsigned long)compat_ptr(arg));
+}
+#endif
+
static const struct tty_operations tty3270_ops = {
.open = tty3270_open,
.close = tty3270_close,
@@ -1745,6 +1761,9 @@ static const struct tty_operations tty3270_ops = {
.hangup = tty3270_hangup,
.wait_until_sent = tty3270_wait_until_sent,
.ioctl = tty3270_ioctl,
+#ifdef CONFIG_COMPAT
+ .compat_ioctl = tty3270_compat_ioctl,
+#endif
.set_termios = tty3270_set_termios
};

2009-11-16 08:33:12

by Martin Schwidefsky

Subject: Re: s390: move keyboard compat ioctls into tty3270 driver

On Fri, 13 Nov 2009 16:31:17 +0100
Arnd Bergmann <[email protected]> wrote:

> All keyboard ioctls are compatible, so we can simply
> move the compat handling into the vt and tty3270 drivers.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

I'll add the patch to the queue. Thanks ..

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.