Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7689e82efdb636e8a076a1293b977bce313110c5
Commit:     7689e82efdb636e8a076a1293b977bce313110c5
Parent:     6d877688ef411313c94aa3c83c7473fbec6db32c
Author:     Cornelia Huck <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 9 11:59:59 2007 -0700
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sat Jul 14 19:28:10 2007 -0500

    [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
    
    With
    
     dma-mapping-prevent-dma-dependent-code-from-linking-on.patch
    
    scsi fails to build on !HAS_DMA architectures:
    
    drivers/built-in.o(.text+0x20af6): In function `scsi_dma_map':
    : undefined reference to `dma_map_sg'
    drivers/built-in.o(.text+0x20b5c): In function `scsi_dma_unmap':
    : undefined reference to `dma_unmap_sg'
    
    I split those functions out into a new file. Builds on s390 and i386.
    
    Move scsi_dma_{map,unmap} into scsi_lib_dma.c which is only build if
    HAS_DMA is set.
    
    Signed-off-by: Cornelia Huck <[EMAIL PROTECTED]>
    Cc: Martin Schwidefsky <[EMAIL PROTECTED]>
    Cc: Heiko Carstens <[EMAIL PROTECTED]>
    Cc: James Bottomley <[EMAIL PROTECTED]>
    Cc: Jeff Garzik <[EMAIL PROTECTED]>
    Cc: Christoph Hellwig <[EMAIL PROTECTED]>
    Cc: Dan Williams <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/Kconfig        |    5 ++++
 drivers/scsi/Makefile       |    6 ++--
 drivers/scsi/scsi_lib.c     |   38 --------------------------------
 drivers/scsi/scsi_lib_dma.c |   50 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 874cfee..6ac3873 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -10,6 +10,7 @@ config RAID_ATTRS
 config SCSI
        tristate "SCSI device support"
        depends on BLOCK
+       select SCSI_DMA if HAS_DMA
        ---help---
          If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
          any other SCSI device under Linux, say Y and make sure that you know
@@ -29,6 +30,10 @@ config SCSI
          However, do not compile this as a module if your root file system
          (the one containing the directory /) is located on a SCSI device.
 
+config SCSI_DMA
+       bool
+       default n
+
 config SCSI_TGT
        tristate "SCSI target support"
        depends on SCSI && EXPERIMENTAL
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index cbc2e2b..0f86895 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -148,9 +148,9 @@ obj-$(CONFIG_SCSI_DEBUG)    += scsi_debug.o
 obj-$(CONFIG_SCSI_WAIT_SCAN)   += scsi_wait_scan.o
 
 scsi_mod-y                     += scsi.o hosts.o scsi_ioctl.o constants.o \
-                                  scsicam.o scsi_error.o scsi_lib.o \
-                                  scsi_scan.o scsi_sysfs.o \
-                                  scsi_devinfo.o
+                                  scsicam.o scsi_error.o scsi_lib.o
+scsi_mod-$(CONFIG_SCSI_DMA)    += scsi_lib_dma.o
+scsi_mod-y                     += scsi_scan.o scsi_sysfs.o scsi_devinfo.o
 scsi_mod-$(CONFIG_SCSI_NETLINK)        += scsi_netlink.o
 scsi_mod-$(CONFIG_SYSCTL)      += scsi_sysctl.o
 scsi_mod-$(CONFIG_SCSI_PROC_FS)        += scsi_proc.o
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 70454b4..1f5a07b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2290,41 +2290,3 @@ void scsi_kunmap_atomic_sg(void *virt)
        kunmap_atomic(virt, KM_BIO_SRC_IRQ);
 }
 EXPORT_SYMBOL(scsi_kunmap_atomic_sg);
-
-/**
- * scsi_dma_map - perform DMA mapping against command's sg lists
- * @cmd:       scsi command
- *
- * Returns the number of sg lists actually used, zero if the sg lists
- * is NULL, or -ENOMEM if the mapping failed.
- */
-int scsi_dma_map(struct scsi_cmnd *cmd)
-{
-       int nseg = 0;
-
-       if (scsi_sg_count(cmd)) {
-               struct device *dev = cmd->device->host->shost_gendev.parent;
-
-               nseg = dma_map_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
-                                 cmd->sc_data_direction);
-               if (unlikely(!nseg))
-                       return -ENOMEM;
-       }
-       return nseg;
-}
-EXPORT_SYMBOL(scsi_dma_map);
-
-/**
- * scsi_dma_unmap - unmap command's sg lists mapped by scsi_dma_map
- * @cmd:       scsi command
- */
-void scsi_dma_unmap(struct scsi_cmnd *cmd)
-{
-       if (scsi_sg_count(cmd)) {
-               struct device *dev = cmd->device->host->shost_gendev.parent;
-
-               dma_unmap_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
-                            cmd->sc_data_direction);
-       }
-}
-EXPORT_SYMBOL(scsi_dma_unmap);
diff --git a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c
new file mode 100644
index 0000000..ac6855c
--- /dev/null
+++ b/drivers/scsi/scsi_lib_dma.c
@@ -0,0 +1,50 @@
+/*
+ * SCSI library functions depending on DMA
+ */
+
+#include <linux/blkdev.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+/**
+ * scsi_dma_map - perform DMA mapping against command's sg lists
+ * @cmd:       scsi command
+ *
+ * Returns the number of sg lists actually used, zero if the sg lists
+ * is NULL, or -ENOMEM if the mapping failed.
+ */
+int scsi_dma_map(struct scsi_cmnd *cmd)
+{
+       int nseg = 0;
+
+       if (scsi_sg_count(cmd)) {
+               struct device *dev = cmd->device->host->shost_gendev.parent;
+
+               nseg = dma_map_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
+                                 cmd->sc_data_direction);
+               if (unlikely(!nseg))
+                       return -ENOMEM;
+       }
+       return nseg;
+}
+EXPORT_SYMBOL(scsi_dma_map);
+
+/**
+ * scsi_dma_unmap - unmap command's sg lists mapped by scsi_dma_map
+ * @cmd:       scsi command
+ */
+void scsi_dma_unmap(struct scsi_cmnd *cmd)
+{
+       if (scsi_sg_count(cmd)) {
+               struct device *dev = cmd->device->host->shost_gendev.parent;
+
+               dma_unmap_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
+                            cmd->sc_data_direction);
+       }
+}
+EXPORT_SYMBOL(scsi_dma_unmap);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to