[PATCH] swim: don't call blk_queue_bounce_limit

[PATCH] swim: don't call blk_queue_bounce_limit

[Christoph Hellwig]

m68k doesn't support highmem, so don't bother enabling the block layer
bounce buffer code.  Just for safety throw in a depend on !HIGHMEM.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/block/Kconfig | 2 +-
 drivers/block/swim.c  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index fd236158f32d99..cbc9f7a18c99e9 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -50,7 +50,7 @@ config MAC_FLOPPY
 
 config BLK_DEV_SWIM
 	tristate "Support for SWIM Macintosh floppy"
-	depends on M68K && MAC
+	depends on M68K && MAC && !HIGHMEM
 	help
 	  You should select this option if you want floppy support
 	  and you don't have a II, IIfx, Q900, Q950 or AV series.
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index cc6a0bc6c005a7..2917b21f48ff27 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -816,8 +816,6 @@ static int swim_floppy_init(struct swim_priv *swd)
 		}
 
 		swd->unit[drive].disk->queue = q;
-		blk_queue_bounce_limit(swd->unit[drive].disk->queue,
-				BLK_BOUNCE_HIGH);
 		swd->unit[drive].disk->queue->queuedata = &swd->unit[drive];
 		swd->unit[drive].swd = swd;
 	}
-- 
2.30.1

Re: [PATCH] swim: don't call blk_queue_bounce_limit

[Jens Axboe]

On 4/6/21 12:17 AM, Christoph Hellwig wrote:
> m68k doesn't support highmem, so don't bother enabling the block layer
> bounce buffer code.  Just for safety throw in a depend on !HIGHMEM.
> 

Applied, thanks.
-- 
Jens Axboe