lkml.org 
[lkml]   [2009]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/5] arch/um: handle compat_ioctl in tty line driver
    On Thu, Aug 06, 2009 at 03:09:26PM +0200, Arnd Bergmann wrote:
    >This pushes the handling of VT specific ioctls down to the
    >UML specific drivers so we can remove it from the common
    >compat_ioctl.c file.
    >
    >Cc: Jeff Dike <jdike@addtoit.com>
    >Signed-off-by: Arnd Bergmann <arnd@arndb.de>


    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>



    >---
    > arch/um/drivers/line.c | 6 ++++++
    > arch/um/drivers/ssl.c | 1 +
    > arch/um/drivers/stdio_console.c | 1 +
    > arch/um/include/shared/line.h | 2 ++
    > 4 files changed, 10 insertions(+), 0 deletions(-)
    >
    >diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
    >index 14a102e..9819a3b 100644
    >--- a/arch/um/drivers/line.c
    >+++ b/arch/um/drivers/line.c
    >@@ -314,6 +314,12 @@ int line_ioctl(struct tty_struct *tty, struct file * file,
    > return ret;
    > }
    >
    >+long line_compat_ioctl(struct tty_struct *tty, struct file * file,
    >+ unsigned int cmd, unsigned long arg)
    >+{
    >+ return line_ioctl(tty, file, cmd, arg);
    >+}
    >+
    > void line_throttle(struct tty_struct *tty)
    > {
    > struct line *line = tty->driver_data;
    >diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
    >index f1786e6..eccf14a 100644
    >--- a/arch/um/drivers/ssl.c
    >+++ b/arch/um/drivers/ssl.c
    >@@ -137,6 +137,7 @@ static const struct tty_operations ssl_ops = {
    > .flush_chars = line_flush_chars,
    > .set_termios = line_set_termios,
    > .ioctl = line_ioctl,
    >+ .compat_ioctl = line_compat_ioctl,
    > .throttle = line_throttle,
    > .unthrottle = line_unthrottle,
    > #if 0
    >diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
    >index 49266f6..2cb1f04 100644
    >--- a/arch/um/drivers/stdio_console.c
    >+++ b/arch/um/drivers/stdio_console.c
    >@@ -120,6 +120,7 @@ static const struct tty_operations console_ops = {
    > .flush_chars = line_flush_chars,
    > .set_termios = line_set_termios,
    > .ioctl = line_ioctl,
    >+ .compat_ioctl = line_compat_ioctl,
    > .throttle = line_throttle,
    > .unthrottle = line_unthrottle,
    > };
    >diff --git a/arch/um/include/shared/line.h b/arch/um/include/shared/line.h
    >index 311a0d3..6ef62e4 100644
    >--- a/arch/um/include/shared/line.h
    >+++ b/arch/um/include/shared/line.h
    >@@ -79,6 +79,8 @@ extern void line_flush_chars(struct tty_struct *tty);
    > extern int line_write_room(struct tty_struct *tty);
    > extern int line_ioctl(struct tty_struct *tty, struct file * file,
    > unsigned int cmd, unsigned long arg);
    >+extern long line_compat_ioctl(struct tty_struct *tty, struct file * file,
    >+ unsigned int cmd, unsigned long arg);
    > extern void line_throttle(struct tty_struct *tty);
    > extern void line_unthrottle(struct tty_struct *tty);
    >
    >--
    >1.6.3.3
    >
    >--
    >To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    >the body of a message to majordomo@vger.kernel.org
    >More majordomo info at http://vger.kernel.org/majordomo-info.html
    >Please read the FAQ at http://www.tux.org/lkml/


    \
     
     \ /
      Last update: 2009-08-13 07:09    [W:3.921 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site