VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / scsi / aacraid / comminit.c

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index beb561f..d3ca7a3 100644 (file)
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -95,13 +95,18 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         * with the math overloading past 32 bits, thus we must limit this
         * field.
         *
-        * FIXME: this assumes the memory is mapped zero->n, which isnt
-        * always true on real computers.
+        * This assumes the memory is mapped zero->n, which isnt
+        * always true on real computers. It also has some slight problems
+        * with the GART on x86-64. I've btw never tried DMA from PCI space
+        * on this platform but don't be suprised if its problematic.
         */
+#ifndef CONFIG_GART_IOMMU
        if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
                init->HostPhysMemPages = 
                        cpu_to_le32(num_physpages << (PAGE_SHIFT-12));
-       } else {
+       } else 
+#endif 
+       {
                init->HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);
        }