public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] Char: tty, fix tty_port_block_til_ready waiting
@ 2009-06-16 19:13 Jiri Slaby
  2009-06-17  6:31 ` Andrew Morton
  0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2009-06-16 19:13 UTC (permalink / raw)
  To: alan; +Cc: linux-kernel, Jiri Slaby

Use DEFINE_WAIT instead of DECLARE_WAITQUEUE, because we use
prepare/finish_wait since commit
3e3b5c087799e536871c8261b05bc28e4783c8da
(tty: use prepare/finish_wait)

Otherwise we would oops in finish_wait.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
 drivers/char/tty_port.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 62dadfc..a8ed648 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -193,7 +193,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 {
 	int do_clocal = 0, retval;
 	unsigned long flags;
-	DECLARE_WAITQUEUE(wait, current);
+	DEFINE_WAIT(wait, current);
 	int cd;
 
 	/* block if port is in the process of being closed */
-- 
1.6.3.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] Char: tty, fix tty_port_block_til_ready waiting
  2009-06-16 19:13 [PATCH 1/1] Char: tty, fix tty_port_block_til_ready waiting Jiri Slaby
@ 2009-06-17  6:31 ` Andrew Morton
  2009-06-17  7:02   ` Jiri Slaby
  0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2009-06-17  6:31 UTC (permalink / raw)
  To: Jiri Slaby; +Cc: alan, linux-kernel

On Tue, 16 Jun 2009 21:13:00 +0200 Jiri Slaby <jirislaby@gmail.com> wrote:

> Use DEFINE_WAIT instead of DECLARE_WAITQUEUE, because we use
> prepare/finish_wait since commit
> 3e3b5c087799e536871c8261b05bc28e4783c8da
> (tty: use prepare/finish_wait)
> 
> Otherwise we would oops in finish_wait.
> 
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> ---
>  drivers/char/tty_port.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
> index 62dadfc..a8ed648 100644
> --- a/drivers/char/tty_port.c
> +++ b/drivers/char/tty_port.c
> @@ -193,7 +193,7 @@ int tty_port_block_til_ready(struct tty_port *port,
>  {
>  	int do_clocal = 0, retval;
>  	unsigned long flags;
> -	DECLARE_WAITQUEUE(wait, current);
> +	DEFINE_WAIT(wait, current);

That won't compile.  DEFINE_WAIT(wait) will though.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] Char: tty, fix tty_port_block_til_ready waiting
  2009-06-17  6:31 ` Andrew Morton
@ 2009-06-17  7:02   ` Jiri Slaby
  0 siblings, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2009-06-17  7:02 UTC (permalink / raw)
  To: Andrew Morton; +Cc: alan, linux-kernel

On 06/17/2009 08:31 AM, Andrew Morton wrote:
>> --- a/drivers/char/tty_port.c
>> +++ b/drivers/char/tty_port.c
>> @@ -193,7 +193,7 @@ int tty_port_block_til_ready(struct tty_port *port,
>>  {
>>  	int do_clocal = 0, retval;
>>  	unsigned long flags;
>> -	DECLARE_WAITQUEUE(wait, current);
>> +	DEFINE_WAIT(wait, current);
> 
> That won't compile.  DEFINE_WAIT(wait) will though.

Ah, crap. One should teach himself using commit --amend.

Sorry.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-06-17  7:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-16 19:13 [PATCH 1/1] Char: tty, fix tty_port_block_til_ready waiting Jiri Slaby
2009-06-17  6:31 ` Andrew Morton
2009-06-17  7:02   ` Jiri Slaby

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox