diff mbox

Please fix the compilation error in LTSI 3.10.61

Message ID DC1D348C835A5240A6FE72FA32B905740424FA5E@pgsmsx106.gar.corp.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lim, Siew Hoon Dec. 11, 2014, 6:40 a.m. UTC 
Hi,

Please fix the compilation error in LTSI3.10.61.

CC [M]  drivers/scsi/bfa/bfa_core.o
drivers/tty/serial/8250/8250_dw.c: In function 'dw8250_handle_irq':
drivers/tty/serial/8250/8250_dw.c:161:25: error: 'd' undeclared (first use in this function)
drivers/tty/serial/8250/8250_dw.c:161:25: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [drivers/tty/serial/8250/8250_dw.o] Error 1
make[3]: *** [drivers/tty/serial/8250] Error 2
make[2]: *** [drivers/tty/serial] Error 2
make[1]: *** [drivers/tty] Error 2
make[1]: *** Waiting for unfinished jobs....

cause by commit id: 1e6d1ee7d3aa94cd721ebcd7c87a96bc0330c1ef
complaining `d' undeclared.

static int dw8250_handle_irq(struct uart_port *p)
{
        unsigned int iir = p->serial_in(p, UART_IIR);

        if (serial8250_handle_irq(p, iir)) {
                return 1;
        } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
                /* Clear the USR */
                (void)p->serial_in(p, d->usr_reg);

                return 1;
        }

        return 0;
}

To fix the compilation error:


thanks.
...siewhoon

Comments

Greg Kroah-Hartman Dec. 11, 2014, 2:54 p.m. UTC | #1 
On Thu, Dec 11, 2014 at 06:40:51AM +0000, Lim, Siew Hoon wrote:
> Hi,
> 
> Please fix the compilation error in LTSI3.10.61.
> 
> CC [M]  drivers/scsi/bfa/bfa_core.o
> drivers/tty/serial/8250/8250_dw.c: In function 'dw8250_handle_irq':
> drivers/tty/serial/8250/8250_dw.c:161:25: error: 'd' undeclared (first use in this function)
> drivers/tty/serial/8250/8250_dw.c:161:25: note: each undeclared identifier is reported only once for each function it appears in
> make[4]: *** [drivers/tty/serial/8250/8250_dw.o] Error 1
> make[3]: *** [drivers/tty/serial/8250] Error 2
> make[2]: *** [drivers/tty/serial] Error 2
> make[1]: *** [drivers/tty] Error 2
> make[1]: *** Waiting for unfinished jobs....
> 
> cause by commit id: 1e6d1ee7d3aa94cd721ebcd7c87a96bc0330c1ef

I don't see that commit id anywhere in any tree, where are you getting
that from?

> complaining `d' undeclared.
> 
> static int dw8250_handle_irq(struct uart_port *p)
> {
>         unsigned int iir = p->serial_in(p, UART_IIR);
> 
>         if (serial8250_handle_irq(p, iir)) {
>                 return 1;
>         } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
>                 /* Clear the USR */
>                 (void)p->serial_in(p, d->usr_reg);
> 
>                 return 1;
>         }
> 
>         return 0;
> }
> 
> To fix the compilation error:
> 
> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
> index a278d1d..2c05c46 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
> @@ -153,6 +153,7 @@ static unsigned int dw8250_serial_in32(struct uart_port *p, int offset)
> static int dw8250_handle_irq(struct uart_port *p)
> {
>         unsigned int iir = p->serial_in(p, UART_IIR);
> +      struct dw8250_data *d = p->private_data;
>         if (serial8250_handle_irq(p, iir)) {
>                 return 1;
> 
> 

I don't understand, what patch is broken?  How did it break suddenly?
Why are you sending patches in html format and expecting me to be able
to apply them?  :)

thanks,

greg k-h
Geert Uytterhoeven Dec. 11, 2014, 6:56 p.m. UTC | #2 
On Thu, Dec 11, 2014 at 3:54 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Thu, Dec 11, 2014 at 06:40:51AM +0000, Lim, Siew Hoon wrote:
>> Please fix the compilation error in LTSI3.10.61.
>>
>> CC [M]  drivers/scsi/bfa/bfa_core.o
>> drivers/tty/serial/8250/8250_dw.c: In function 'dw8250_handle_irq':
>> drivers/tty/serial/8250/8250_dw.c:161:25: error: 'd' undeclared (first use in this function)
>> drivers/tty/serial/8250/8250_dw.c:161:25: note: each undeclared identifier is reported only once for each function it appears in
>> make[4]: *** [drivers/tty/serial/8250/8250_dw.o] Error 1
>> make[3]: *** [drivers/tty/serial/8250] Error 2
>> make[2]: *** [drivers/tty/serial] Error 2
>> make[1]: *** [drivers/tty] Error 2
>> make[1]: *** Waiting for unfinished jobs....
>>
>> cause by commit id: 1e6d1ee7d3aa94cd721ebcd7c87a96bc0330c1ef
>
> I don't see that commit id anywhere in any tree, where are you getting
> that from?

The use of 'd->usr_reg' was added by:

origin/3.10-ltsi:patches.baytrail/1148-tty-8250_dw-Add-support-for-OCTEON-UARTS.patch
Upstream commit d5f1af7ece96cf52 ("tty/8250_dw: Add support for OCTEON UARTS.")

Why don't we have the local variable 'd'?

Because it was removed by commit 6d5e793314178861 ("serial: 8250_dw:
Improve unwritable LCR workaround"), probably to fix a compiler warning:

    [wangnan: backport to 3.10.43:
      - adjust context
      - remove unneeded local var]
    Signed-off-by: Wang Nan <wangnan0@huawei.com>

So it looks like d5f1af7ece96cf52 was a prerequisite for 6d5e793314178861,
while v3.10.48 only got a modified version of the latter, and
3.10-ltsi got the former
afterwards, breaking the build.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
diff mbox

Patch

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index a278d1d..2c05c46 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -153,6 +153,7 @@  static unsigned int dw8250_serial_in32(struct uart_port *p, int offset)
static int dw8250_handle_irq(struct uart_port *p)
{
        unsigned int iir = p->serial_in(p, UART_IIR);
+      struct dw8250_data *d = p->private_data;
        if (serial8250_handle_irq(p, iir)) {
                return 1;