linux-kernel - Re: [Patch] um: fix a build error

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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 22 Jul 2008 18:35:09 +0100
From:	WANG Cong <xiyou.wangcong@...il.com>
To:	Alan Cox <alan@...rguk.ukuu.org.uk>
Cc:	Eric Sesterhenn <snakebyte@....de>, xiyou.wangcong@...il.com,
	linux-kernel@...r.kernel.org,
	user-mode-linux-devel@...ts.sourceforge.net, jdike@...toit.com
Subject: Re: [Patch] um: fix a build error

On Tue, Jul 22, 2008 at 11:53:54AM +0100, Alan Cox wrote:
>> Signed-off-by: Eric Sesterhenn <snakebyte@....de>
>> 
>> --- linux-2.6/arch/um/drivers/line.c.orig	2008-07-22 12:06:17.000000000 +0200
>> +++ linux-2.6/arch/um/drivers/line.c	2008-07-22 12:06:49.000000000 +0200
>> @@ -362,10 +362,8 @@ static irqreturn_t line_write_interrupt(
>>  	if (tty == NULL)
>>  		return IRQ_NONE;
>>  
>> -	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
>> -	   (tty->ldisc.write_wakeup != NULL))
>> -		(tty->ldisc.write_wakeup)(tty);
>> -
>> +	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags))
>> +		tty_wakeup(tty);
>
>Sorry I should have been clearer - you don't want the test_bit either.
>

What about the below one?

Signed-off-by: WANG Cong <wangcong@...ux.org>

---

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 5047490..d741f35 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -362,19 +362,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
 	if (tty == NULL)
 		return IRQ_NONE;
 
-	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
-	   (tty->ldisc.write_wakeup != NULL))
-		(tty->ldisc.write_wakeup)(tty);
-
-	/*
-	 * BLOCKING mode
-	 * In blocking mode, everything sleeps on tty->write_wait.
-	 * Sleeping in the console driver would break non-blocking
-	 * writes.
-	 */
-
-	if (waitqueue_active(&tty->write_wait))
-		wake_up_interruptible(&tty->write_wait);
+	tty_wakeup(tty);
 	return IRQ_HANDLED;
 }
 
--
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/