[patch 2.6.9-rc1-bk11] riscom8: previous patch did not compile

From: Adam J. Richter (adam_at_yggdrasil.com)
Date: 09/05/04

  • Next message: Brad Campbell: "Re: Crashed Drive, libata wedges when trying to recover data" 
    Date:	Sun, 5 Sep 2004 11:57:30 -0700
To: janitor@sternwelten.at

            linux-2.6.9-rc1-bk11/drivers/char/riscom8.c added
    the patch "drivers/char/riscom8.c MIN/MAX removal", which
    had a typo where one of the new min_t() calls is missing the
    type parameter. Because both of the parameters and the result
    are all explicitly declared int on all architectures, I changed
    it to use min() rather than min_t(int, ...).

            This is the third patch in bk11 that never could have compiled
    anywhere. Although I am glad to see patches being integrated into the
    stock kernel more quickly, I would ask each submitter either

            (1) check that the patch being submitted has compiled somewhere, or
            (2) mention in the submission when this has not been done.

    Signed-off-by: Adam J. Richter <adam@yggdrasil.com>
                        __ ______________
    Adam J. Richter \ /
    adam@yggdrasil.com | g g d r a s i l

    --- linux-2.6.9-rc1-bk11/drivers/char/riscom8.c 2004-09-05 09:11:24.000000000 -0700
    +++ linux/drivers/char/riscom8.c 2004-09-05 11:35:58.000000000 -0700
    @@ -1174,8 +1174,8 @@
                             }
     
                             cli();
    - c = min_t(c, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
    - SERIAL_XMIT_SIZE - port->xmit_head));
    + c = min(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);
                             port->xmit_cnt += c;
    -
    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/

  • Next message: Brad Campbell: "Re: Crashed Drive, libata wedges when trying to recover data"