commit bee707a7b75c4784b674261d0d1190b1e20d6a29
author Santosh Shilimkar <santosh.shilimkar@ti.com> Tue Feb 18 18:57:54 2014 -0500
committer Santosh Shilimkar <santosh.shilimkar@ti.com> Tue Feb 18 18:57:54 2014 -0500
tree 8276ba0481e7140c7f8dfe2cc313ed0d101dc324
parent 14eec74a9a220178556098a1d475e71bdf550413
parent 4567526ad9e3305680a849713928e950c9066541

Merge branch 'v3.13/memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/keystone into v3.13/master

drivers/mmc/card/queue.c

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 357bbc5..3e049c1 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -197,7 +197,7 @@
 	struct mmc_queue_req *mqrq_prev = &mq->mqrq[1];
 
 	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
-		limit = dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
+		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
 
 	mq->card = card;
 	mq->queue = blk_init_queue(mmc_request_fn, lock);

drivers/scsi/scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7bd7f0d..62ec84b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1684,7 +1684,7 @@
 
 	host_dev = scsi_get_device(shost);
 	if (host_dev && host_dev->dma_mask)
-		bounce_limit = dma_max_pfn(host_dev) << PAGE_SHIFT;
+		bounce_limit = (u64)dma_max_pfn(host_dev) << PAGE_SHIFT;
 
 	return bounce_limit;
 }