lkml.org 
[lkml]   [2002]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: 2.4.36 - trm290
    On Fri, Sep 20 2002, Pawel Bernadowski wrote:
    > i didn`t compile 2.5.36(& 37).. error :
    >
    > gcc -Wp,-MD,./.trm290.o.d -D__KERNEL__
    > -I/home/users/builder/rpm/BUILD/linux-2.5.37/include -Wall
    > -Wstrict-prototypes -Wno-trigraphs -O2
    > -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe
    > -mpreferred-stack-boundary=2 -march=i686
    > -I/home/users/builder/rpm/BUILD/linux-2.5.37/arch/i386/mach-generic
    > -nostdinc -iwithprefix include -I../ -DKBUILD_BASENAME=trm290 -c -o
    > trm290.o
    > trm290.c
    > trm290.c: In function `trm290_ide_dma_write':
    > trm290.c:195: too many arguments to function `ide_build_dmatable'
    > trm290.c: In function `trm290_ide_dma_read':
    > trm290.c:239: too many arguments to function `ide_build_dmatable'
    > make[3]: *** [trm290.o] Error 1

    Might fix this differently later, but this should make it work for now.
    The reason for the error is that 2.4.20-pre-ac has the extra argument to
    indicate data direction, however this isn't needed on 2.5 since the
    request has a data direction bit.

    # This is a BitKeeper generated patch for the following project:
    # Project Name: Linux kernel tree
    # This patch format is intended for GNU patch command version 2.5 or higher.
    # This patch includes the following deltas:
    # ChangeSet 1.603 -> 1.604
    # drivers/ide/pci/trm290.c 1.5 -> 1.6
    #
    # The following is the BitKeeper ChangeSet Log
    # --------------------------------------------
    # 02/09/23 axboe@burns.home.kernel.dk 1.604
    # Bad merge from 2.4.20-pre-ac, ide_build_dmatable() does not need data
    # direction argument in 2.5 (it's implicit in the request)
    # --------------------------------------------
    #
    diff -Nru a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
    --- a/drivers/ide/pci/trm290.c Mon Sep 23 12:48:51 2002
    +++ b/drivers/ide/pci/trm290.c Mon Sep 23 12:48:51 2002
    @@ -192,7 +192,7 @@
    trm290_prepare_drive(drive, 0); /* select PIO xfer */
    return 1;
    #endif
    - if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_TODEVICE))) {
    + if (!(count = ide_build_dmatable(drive, rq))) {
    /* try PIO instead of DMA */
    trm290_prepare_drive(drive, 0); /* select PIO xfer */
    return 1;
    @@ -236,7 +236,7 @@
    task_ioreg_t command = WIN_NOP;
    unsigned int count, reading = 2, writing = 0;

    - if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_FROMDEVICE))) {
    + if (!(count = ide_build_dmatable(drive, rq))) {
    /* try PIO instead of DMA */
    trm290_prepare_drive(drive, 0); /* select PIO xfer */
    return 1;
    --
    Jens Axboe

    -
    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 13:29    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean