UBUNTU: SAUCE: storvsc: use small sg_tablesize on x86

BugLink: http://bugs.launchpad.net/bugs/1495983
OriginalAuthor: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index e6718a74e5daea9842e35c6d45abf59bb5475489..3bd911a18ba76863551ec4f78283797dbb286c84 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1996,6 +1996,12 @@ static int storvsc_probe(struct hv_device *device,
         * from the host.
         */
        host->sg_tablesize = (stor_device->max_transfer_bytes >> PAGE_SHIFT);
+#if defined(CONFIG_X86_32)
+       dev_warn(&device->device, "adjusting sg_tablesize 0x%x -> 0x%x",
+                       host->sg_tablesize, MAX_MULTIPAGE_BUFFER_COUNT);
+       host->sg_tablesize = MAX_MULTIPAGE_BUFFER_COUNT;
+#endif
+
        /*
         * For non-IDE disks, the host supports multiple channels.
         * Set the number of HW queues we are supporting.