Re: [Patch] um: fix a build error - Kernel

This is a discussion on Re: [Patch] um: fix a build error - Kernel ; I just ran across the same build error, does something like this look reasonable? Only build and boot tested. This fixes the following build error: CC arch/um/drivers/line.o arch/um/drivers/line.c: In function ‘line_write_interrupt’: arch/um/drivers/line.c:366: error: ‘struct tty_ldisc’ has no member named ‘write_wakeup’ ...

+ Reply to Thread
Results 1 to 5 of 5

Thread: Re: [Patch] um: fix a build error

  1. Re: [Patch] um: fix a build error

    I just ran across the same build error, does
    something like this look reasonable? Only build
    and boot tested.

    This fixes the following build error:

    CC arch/um/drivers/line.o
    arch/um/drivers/line.c: In function ‘line_write_interrupt’:
    arch/um/drivers/line.c:366: error: ‘struct tty_ldisc’ has no member
    named ‘write_wakeup’
    arch/um/drivers/line.c:367: error: ‘struct tty_ldisc’ has no member
    named ‘write_wakeup’
    make[1]: *** [arch/um/drivers/line.o] Error 1
    make: *** [arch/um/drivers] Error 2


    Signed-off-by: Eric Sesterhenn

    --- 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);
    /*
    * BLOCKING mode
    * In blocking mode, everything sleeps on tty->write_wait.
    --
    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/

  2. Re: [Patch] um: fix a build error

    > Signed-off-by: Eric Sesterhenn
    >
    > --- 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.

    Acked-by: Alan Cox

    however as it is still right but you can stick my Ack on a version
    without the if too.
    --
    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/

  3. 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
    >>
    >> --- 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.
    >


    Sure, tty_wakeup() already does that test.

    And, tty_wakeup() also does wake_up_interruptible(), so I think
    the wake_up_interruptible() below can also be removed, probably.

    Thanks.

    --
    The opposite of love is not hate, but indifference.
    --Elie Wiesel
    --
    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/

  4. 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
    >>
    >> --- 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

    ---

    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@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. Re: [Patch] um: fix a build error

    On Tue, 22 Jul 2008 18:35:09 +0100
    WANG Cong wrote:

    > On Tue, Jul 22, 2008 at 11:53:54AM +0100, Alan Cox wrote:
    > >> Signed-off-by: Eric Sesterhenn
    > >>
    > >> --- 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


    Acked-by: Alan Cox
    --
    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/

+ Reply to Thread