lkml.org 
[lkml]   [2004]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] 2.6.9-rc1-mm3: char/riscom8.c doesn't compile
    On Fri, Sep 03, 2004 at 01:48:11AM -0700, Andrew Morton wrote:
    >...
    > Changes since 2.6.9-rc1-mm2:
    >...
    > +drivers-char-riscom8c-min-max-removal.patch
    >...
    > Janitorial things
    >...

    Doesn't compile:

    <-- snip -->

    ...
    CC drivers/char/riscom8.o
    drivers/char/riscom8.c:1178: macro `min_t' used with only 2 args
    ...
    make[2]: *** [drivers/char/riscom8.o] Error 1

    <-- snip -->


    Trivial fix:


    Signed-off-by: Adrian Bunk <bunk@fs.tum.de>

    --- linux-2.6.9-rc1-mm3-full/drivers/char/riscom8.c.old 2004-09-04 11:36:08.000000000 +0200
    +++ linux-2.6.9-rc1-mm3-full/drivers/char/riscom8.c 2004-09-04 11:36:57.000000000 +0200
    @@ -1174,7 +1174,7 @@
    }

    cli();
    - c = min_t(c, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
    + c = min_t(int, c, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
    SERIAL_XMIT_SIZE - port->xmit_head));
    memcpy(port->xmit_buf + port->xmit_head, tmp_buf, c);
    port->xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
    -
    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/
    \
     
     \ /
      Last update: 2005-03-22 14:05    [W:4.183 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site