From 51b79ab3404e47fdf3e5f347b6c76e2cadd8916f Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Thu, 16 Sep 2010 12:55:57 +0900
Subject: [PATCH] --- yaml --- r: 213043 b: refs/heads/master c:
 2610a25406087ef797f4187e7f82dd04335056c7 h: refs/heads/master i:   213041:
 dea0020350d33bd3ad69a12b11b3f34d07389398   213039:
 ddd966a09cc968c25c6e9b4298f8503efe2c8be2 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/sg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a6d9a0b5fcab..ac20bd638ec4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5af921ec02333e943efb59aca4f56b78fc0e100
+refs/heads/master: 2610a25406087ef797f4187e7f82dd04335056c7
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
index 78d616315d8e..655ab920cff4 100644
--- a/trunk/drivers/scsi/sg.c
+++ b/trunk/drivers/scsi/sg.c
@@ -1657,7 +1657,7 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
 	if (sg_allow_dio && hp->flags & SG_FLAG_DIRECT_IO &&
 	    dxfer_dir != SG_DXFER_UNKNOWN && !iov_count &&
 	    !sfp->parentdp->device->host->unchecked_isa_dma &&
-	    blk_rq_aligned(q, hp->dxferp, dxfer_len))
+	    blk_rq_aligned(q, (unsigned long)hp->dxferp, dxfer_len))
 		md = NULL;
 	else
 		md = &map_data;