linux-kernel - [PATCH] Fix ia64 simserial.c for Ldisc revamp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <57C9024A16AD2D4C97DC78E552063EA3064DE226@orsmsx505.amr.corp.intel.com>
Date:	Thu, 10 Jul 2008 13:46:49 -0700
From:	"Luck, Tony" <tony.luck@...el.com>
To:	"alan@...hat.com" <alan@...hat.com>
CC:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] Fix ia64 simserial.c for Ldisc revamp

This driver is "hidden" in arch/ia64 ... so it didn't get updated
by the Ldisc revamp.

Signed-off-by: Tony Luck <tony.luck@...el.com>


diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 23cafc8..f870bbf 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -354,8 +354,8 @@ static void rs_flush_buffer(struct tty_struct *tty)
        wake_up_interruptible(&tty->write_wait);

        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-           tty->ldisc.write_wakeup)
-               (tty->ldisc.write_wakeup)(tty);
+           tty->ldisc.ops->write_wakeup)
+               (tty->ldisc.ops->write_wakeup)(tty);
 }

 /*
@@ -407,8 +407,9 @@ static void rs_unthrottle(struct tty_struct * tty)
 /*
  * rs_break() --- routine which turns the break handling on or off
  */
-static void rs_break(struct tty_struct *tty, int break_state)
+static int rs_break(struct tty_struct *tty, int break_state)
 {
+       return 0;
 }

 static int rs_ioctl(struct tty_struct *tty, struct file * file,
@@ -625,7 +626,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
        shutdown(info);
        if (tty->ops->flush_buffer)
                tty->ops->flush_buffer(tty);
-       if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
+       if (tty->ldisc.ops->flush_buffer) tty->ldisc.ops->flush_buffer(tty);
        info->event = 0;
        info->tty = NULL;
        if (info->blocked_open) {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/