5 files changed, 10 insertions, 7 deletions

diff --git a/arch/arm/mach-rpc/include/mach/isa-dma.h b/arch/arm/mach-rpc/include/mach/isa-dma.h
index bad72054858..67bfc6719c3 100644
--- a/arch/arm/mach-rpc/include/mach/isa-dma.h
+++ b/arch/arm/mach-rpc/include/mach/isa-dma.h
@@ -23,5 +23,7 @@
 
 #define DMA_FLOPPY              DMA_VIRTUAL_FLOPPY
 
+#define IOMD_DMA_BOUNDARY       (PAGE_SIZE - 1)
+
 #endif /* _ASM_ARCH_DMA_H */
 
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 63121f45ba2..d7bc925c524 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -45,8 +45,6 @@ static const struct portinfo pata_icside_portinfo_v6_2 = {
         .stepping       = 6,
 };
 
-#define PATA_ICSIDE_MAX_SG      128
-
 struct pata_icside_state {
         void __iomem *irq_port;
         void __iomem *ioc_base;
@@ -295,8 +293,8 @@ static int icside_dma_init(struct pata_icside_info *info)
 
 static struct scsi_host_template pata_icside_sht = {
         ATA_BASE_SHT(DRV_NAME),
-        .sg_tablesize           = PATA_ICSIDE_MAX_SG,
-        .dma_boundary           = ~0, /* no dma boundaries */
+        .sg_tablesize           = SCSI_MAX_SG_CHAIN_SEGMENTS,
+        .dma_boundary           = IOMD_DMA_BOUNDARY,
 };
 
 static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 68a64123af8..8ee01b90733 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -390,7 +390,8 @@ static struct scsi_host_template cumanascsi2_template = {
         .eh_abort_handler               = fas216_eh_abort,
         .can_queue                      = 1,
         .this_id                        = 7,
-        .sg_tablesize                   = SG_ALL,
+        .sg_tablesize                   = SCSI_MAX_SG_CHAIN_SEGMENTS,
+        .dma_boundary                   = IOMD_DMA_BOUNDARY,
         .cmd_per_lun                    = 1,
         .use_clustering                 = DISABLE_CLUSTERING,
         .proc_name                      = "cumanascsi2",
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index bb2477b3fb0..d8435132f46 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -508,7 +508,8 @@ static struct scsi_host_template eesox_template = {
         .eh_abort_handler               = fas216_eh_abort,
         .can_queue                      = 1,
         .this_id                        = 7,
-        .sg_tablesize                   = SG_ALL,
+        .sg_tablesize                   = SCSI_MAX_SG_CHAIN_SEGMENTS,
+        .dma_boundary                   = IOMD_DMA_BOUNDARY,
         .cmd_per_lun                    = 1,
         .use_clustering                 = DISABLE_CLUSTERING,
         .proc_name                      = "eesox",
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index d9a546d1917..e2297b4c1b9 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -302,7 +302,8 @@ static struct scsi_host_template powertecscsi_template = {
 
         .can_queue                      = 8,
         .this_id                        = 7,
-        .sg_tablesize                   = SG_ALL,
+        .sg_tablesize                   = SCSI_MAX_SG_CHAIN_SEGMENTS,
+        .dma_boundary                   = IOMD_DMA_BOUNDARY,
         .cmd_per_lun                    = 2,
         .use_clustering                 = ENABLE_CLUSTERING,
         .proc_name                      = "powertec",