Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Fri, 4 Oct 2002 15:49:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Fri, 4 Oct 2002 15:49:32 -0400 Received: from nat-pool-rdu.redhat.com ([66.187.233.200]:11679 "EHLO devserv.devel.redhat.com") by vger.kernel.org with ESMTP id ; Fri, 4 Oct 2002 15:49:31 -0400 Date: Fri, 4 Oct 2002 15:54:46 -0400 From: Pete Zaitcev Message-Id: <200210041954.g94Jsku26979@devserv.devel.redhat.com> To: Carlos E Gorges cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH] 2.5.40 - DMA-mapping && misc In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1181 Lines: 32 > --- linux-2.5.40/drivers/scsi/53c7,8xx.c Tue Oct 1 04:06:15 2002 > +++ linux-2.5/drivers/scsi/53c7,8xx.c Fri Oct 4 02:53:48 2002 > @@ -62,8 +62,6 @@ > * the fourth byte from 50 to 25. > */ > > -#error Please convert me to Documentation/DMA-mapping.txt > - > #include > > #ifdef CONFIG_SCSI_NCR53C7xx_sync > @@ -3788,7 +3786,9 @@ > for (i = 0; cmd->use_sg ? (i < cmd->use_sg) : !i; cmd_datain += 4, > cmd_dataout += 4, ++i) { > u32 buf = cmd->use_sg ? > - virt_to_bus(((struct scatterlist *)cmd->buffer)[i].address) : > + virt_to_bus( > + page_address(((struct scatterlist *)cmd->buffer)[i].page) + > + ((struct scatterlist *)cmd->buffer)[i].offset ) : > virt_to_bus(cmd->request_buffer); > u32 count = cmd->use_sg ? > ((struct scatterlist *)cmd->buffer)[i].length : These parts contradict. Remove virt_to_bus, then you can take the #error out, but not before. -- Pete - 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/