From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Thu, 18 Jun 2009 07:56:03 +0000 (+0200)
Subject: block: Fix bounce_pfn setting
X-Git-Tag: firefly_0821_release~13698^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a02c8e8142f7f133d4c6e72bc3e1d830e6b8b9e;p=firefly-linux-kernel-4.4.55.git

block: Fix bounce_pfn setting

Correct stacking bounce_pfn limit setting and prevent warnings on
32-bit.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 7541ea4bf9fe..81bc0d1fdb53 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -112,7 +112,7 @@ void blk_set_default_limits(struct queue_limits *lim)
 	lim->max_segment_size = MAX_SEGMENT_SIZE;
 	lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS;
 	lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;
-	lim->bounce_pfn = BLK_BOUNCE_ANY;
+	lim->bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT);
 	lim->alignment_offset = 0;
 	lim->io_opt = 0;
 	lim->misaligned = 0;